diff --git a/language/common_res.h b/language/common_res.h index b13138757..a3db5f7f3 100644 --- a/language/common_res.h +++ b/language/common_res.h @@ -1244,6 +1244,8 @@ #define IDS_LEX_STR_63377 63377 #define IDS_LEX_STR_63378 63378 #define IDS_LEX_STR_63379 63379 +#define IDS_LEX_STR_63380 63380 +#define IDS_LEX_STR_63381 63381 #define IDS_LEX_CSV_COL_0 63400 #define IDS_LEX_CSV_COL_1 63401 diff --git a/language/np3_de_de/lexer_de_de.rc b/language/np3_de_de/lexer_de_de.rc index f5601d38e..8c911d9aa 100644 --- a/language/np3_de_de/lexer_de_de.rc +++ b/language/np3_de_de/lexer_de_de.rc @@ -485,6 +485,8 @@ BEGIN IDS_LEX_STR_63377 "Special" IDS_LEX_STR_63378 "Syntax Operator" IDS_LEX_STR_63379 "Unclosed String" + IDS_LEX_STR_63380 "URL/IRI" + IDS_LEX_STR_63381 "Compact IRI" END STRINGTABLE diff --git a/language/np3_en_us/lexer_en_us.rc b/language/np3_en_us/lexer_en_us.rc index 4397763bf..90b6e105e 100644 --- a/language/np3_en_us/lexer_en_us.rc +++ b/language/np3_en_us/lexer_en_us.rc @@ -485,6 +485,8 @@ BEGIN IDS_LEX_STR_63377 "Special" IDS_LEX_STR_63378 "Syntax Operator" IDS_LEX_STR_63379 "Unclosed String" + IDS_LEX_STR_63380 "URL/IRI" + IDS_LEX_STR_63381 "Compact IRI" END STRINGTABLE diff --git a/src/StyleLexers/styleLexJSON.c b/src/StyleLexers/styleLexJSON.c index 4e15b9d31..d66bb1939 100644 --- a/src/StyleLexers/styleLexJSON.c +++ b/src/StyleLexers/styleLexJSON.c @@ -30,8 +30,8 @@ EDITLEXER lexJSON = { {SCE_JSON_OPERATOR}, IDS_LEX_STR_63132, L"Operator", L"fore:#B000B0", L"" }, { {SCE_JSON_PROPERTYNAME}, IDS_LEX_STR_63364, L"Property Name", L"fore:#002697", L"" }, { {SCE_JSON_ESCAPESEQUENCE}, IDS_LEX_STR_63366, L"ESC Sequence", L"fore:#0B982E", L"" }, - //{ {SCE_JSON_URI}, IDS_LEX_STR_63252, L"URL/IRI", L"fore:#0000FF", L"" }, - //{ {SCE_JSON_COMPACTIRI}, IDS_LEX_STR_63252, L"JSON-LD compact IRI", L"fore:#D137C1", L"" }, + { {SCE_JSON_URI}, IDS_LEX_STR_63380, L"URL/IRI", L"fore:#0000FF", L"" }, + { {SCE_JSON_COMPACTIRI}, IDS_LEX_STR_63381, L"Compact IRI", L"fore:#D137C1", L"" }, { {SCE_JSON_ERROR}, IDS_LEX_STR_63252, L"Parsing Error", L"fore:#FFFF00; back:#A02020; eolfilled", L"" }, EDITLEXER_SENTINEL } diff --git a/test/test_files/StyleLexers/styleLexJSON/Sample_JSON (issue #3070).json b/test/test_files/StyleLexers/styleLexJSON/Sample_JSON (issue #3070).json index e069559c9..4626c21b6 100644 --- a/test/test_files/StyleLexers/styleLexJSON/Sample_JSON (issue #3070).json +++ b/test/test_files/StyleLexers/styleLexJSON/Sample_JSON (issue #3070).json @@ -12,15 +12,22 @@ No \\n's!", hexadecimal: 0xdecaf, leadingDecimalPoint: 1234567, .8675309, andTrailing: 8675309., positiveSign: +1, - trailingComma: 'in objects', andIn: ['arrays',], + trailingComma: "in objects", andIn: ["arrays",], escSeq: "\uAFFE", "backwardsCompatible": "with JSON", Infinity: Infinity, positiveInfinity: +Infinity, negativeInfinity: -Infinity, NotANumber : NaN, - + strg: 'blah blub', +.. "$id": "0", + "lint:js": "compact IRI", + "test:cov": "cIRI", + "test:e2e:edge": "test1", + "test:e2e:firefox": "test1", + "test:e2e:cloud": "test1", + "abc":"xyz" "AutoRefresh": true, "AutoRefreshRemotes": true, "CommitTextLinks": null,