Skip to content

Commit 8da9d88

Browse files
committed
Release v2.0.3.0
---- - Npp compatibility checking (Issue #64) is disabled in favor of hard-codded compatibility for new Scintille.TextRange API. The checking algorithm became fragile in the latest releases of NPP when the editor restarts itself in Admin mode. - Updated CS-Script embedded engine to v4.6.4 - Updated CS-Script.Syntaxer embedded executable to v3.1.2
1 parent 7e6e53f commit 8da9d88

File tree

104 files changed

+303
-1547
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

104 files changed

+303
-1547
lines changed

src/CSScriptIntellisense/Interop/NppExtensions.cs

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -423,7 +423,11 @@ static public string TextAfterPosition(this ScintillaGateway document, int posit
423423
static public int[] GetNppVersion(out bool newVersioning)
424424
{
425425
// Starting from 8.4.1 new API is available for getting the version with LOWORD always returning 3 digits
426-
// if new messages is not supported go use the old one
426+
// if new messages is not supported so use the old one
427+
428+
// !!! This mechanism is not reliable. NPPM_GETNPPVERSION_NEW may return different
429+
// result (0x0000000000000000 vs 0x000000000000000a) depending if it was started normally or restarted due
430+
// to the "need to be admin to save"
427431

428432
const uint NPPM_GETNPPVERSION_NEW = (uint)(NppMsg.NPPMSG + 109);
429433

@@ -457,6 +461,8 @@ static bool IsNewNppApiVersion
457461

458462
static bool GetIsNewNppApiVersion()
459463
{
464+
return true; // there is no reliable way to get the version of NPP. See GetNppVersion inline-comments
465+
460466
bool newVersioning;
461467
int[] version = GetNppVersion(out newVersioning);
462468

@@ -506,6 +512,7 @@ static bool GetIsNewNppApiVersion()
506512

507513
static string get_text_range(this IScintillaGateway document, int startPos, int endPos, int bufCapacity)
508514
{
515+
// bool newNppVersion = true;
509516
bool newNppVersion = IsNewNppApiVersion;
510517

511518
if (Environment.GetEnvironmentVariable("CSSCRIPT_NPP_NEW_NPP_API") != null)

src/CSScriptNpp/CSScriptNpp/cs-script/cscs.deps.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
{
22
"runtimeTarget": {
3-
"name": ".NETCoreApp,Version=v6.0",
3+
"name": ".NETCoreApp,Version=v7.0",
44
"signature": ""
55
},
66
"compilationOptions": {},
77
"targets": {
8-
".NETCoreApp,Version=v6.0": {
9-
"cscs/4.4.3.0": {
8+
".NETCoreApp,Version=v7.0": {
9+
"cscs/4.6.4": {
1010
"dependencies": {
1111
"Microsoft.CodeAnalysis.CSharp.Scripting": "3.10.0"
1212
},
@@ -468,7 +468,7 @@
468468
}
469469
},
470470
"libraries": {
471-
"cscs/4.4.3.0": {
471+
"cscs/4.6.4": {
472472
"type": "project",
473473
"serviceable": false,
474474
"sha512": ""
-13 KB
Binary file not shown.
4 KB
Binary file not shown.

src/CSScriptNpp/CSScriptNpp/cs-script/cscs.runtimeconfig.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
22
"runtimeOptions": {
3-
"tfm": "net6.0",
3+
"tfm": "net7.0",
44
"framework": {
55
"name": "Microsoft.NETCore.App",
6-
"version": "6.0.0"
6+
"version": "7.0.0"
77
},
88
"configProperties": {
99
"System.Reflection.Metadata.MetadataUpdater.IsSupported": false
512 Bytes
Binary file not shown.
4 KB
Binary file not shown.

src/CSScriptNpp/CSScriptNpp/cs-script/css.runtimeconfig.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
22
"runtimeOptions": {
3-
"tfm": "net6.0",
3+
"tfm": "net7.0",
44
"framework": {
55
"name": "Microsoft.NETCore.App",
6-
"version": "6.0.0"
6+
"version": "7.0.0"
77
},
88
"configProperties": {
99
"System.Reflection.Metadata.MetadataUpdater.IsSupported": false

src/CSScriptNpp/CSScriptNpp/cs-script/csws.deps.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
{
22
"runtimeTarget": {
3-
"name": ".NETCoreApp,Version=v6.0",
3+
"name": ".NETCoreApp,Version=v7.0",
44
"signature": ""
55
},
66
"compilationOptions": {},
77
"targets": {
8-
".NETCoreApp,Version=v6.0": {
9-
"csws/4.4.3.0": {
8+
".NETCoreApp,Version=v7.0": {
9+
"csws/4.6.4": {
1010
"dependencies": {
1111
"Microsoft.CodeAnalysis.CSharp.Scripting": "3.10.0"
1212
},
@@ -468,7 +468,7 @@
468468
}
469469
},
470470
"libraries": {
471-
"csws/4.4.3.0": {
471+
"csws/4.6.4": {
472472
"type": "project",
473473
"serviceable": false,
474474
"sha512": ""
7 KB
Binary file not shown.

0 commit comments

Comments
 (0)