From 601301ad28b2e9dd1dd03e93e42e51930df0909b Mon Sep 17 00:00:00 2001 From: deathaxe Date: Sun, 23 Mar 2025 10:49:23 +0100 Subject: [PATCH] Settings: Fix namespace highlighting Resolves #406 This commit expects a setting namespace to be followed by a valid setting name, but not only numbers. --- .../Sublime Text Settings.sublime-syntax | 2 +- .../syntax_test_settings.json | 22 +++++++++++++++++++ 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/Package/Sublime Text Settings/Sublime Text Settings.sublime-syntax b/Package/Sublime Text Settings/Sublime Text Settings.sublime-syntax index b271b74e..ccadf4f0 100644 --- a/Package/Sublime Text Settings/Sublime Text Settings.sublime-syntax +++ b/Package/Sublime Text Settings/Sublime Text Settings.sublime-syntax @@ -40,7 +40,7 @@ contexts: scope: meta.mapping.key.json string.quoted.double.json punctuation.definition.string.end.json set: [expect-any-settings-value, expect-colon] - include: inside-string - - match: '[\w]+(\.)' + - match: '[\w]+(\.)(?![\d.]+\")' scope: keyword.other.namespace.sublime-settings captures: 1: punctuation.separator.namespace.sublime-settings diff --git a/Package/Sublime Text Settings/syntax_test_settings.json b/Package/Sublime Text Settings/syntax_test_settings.json index 9daa8ee7..d0152a01 100644 --- a/Package/Sublime Text Settings/syntax_test_settings.json +++ b/Package/Sublime Text Settings/syntax_test_settings.json @@ -36,6 +36,28 @@ s // ^^^^^^^^^^^^^^^^^^^^^^^ meta.mapping.value.json // ^ - entity.name.other.key + "disable_plugin_host-3.3": true, +// ^^^^^^^^^^^^^^^^^^^^^^^^^ meta.mapping.key.json string.quoted.double.json +// ^ punctuation.definition.string.begin.json +// ^^^^^^^^^^^^^^^^^^^^^^^ entity.name.other.key.sublime-settings - keyword.other.namespace - punctuation.separator.namespace +// ^ punctuation.definition.string.end.json + + "disable_plugin-1.2.3": true, +// ^^^^^^^^^^^^^^^^^^^^^^ meta.mapping.key.json string.quoted.double.json +// ^ punctuation.definition.string.begin.json +// ^^^^^^^^^^^^^^^^^^^^ entity.name.other.key.sublime-settings - keyword.other.namespace - punctuation.separator.namespace +// ^ punctuation.definition.string.end.json + + "package.3.4.5a": true, +// ^^^^^^^^^^^^^^^^ meta.mapping.key.json string.quoted.double.json +// ^ punctuation.definition.string.begin.json +// ^^^^^^^^^^^^^^ entity.name.other.key.sublime-settings +// ^^^^^^^^^^^^ keyword.other.namespace.sublime-settings +// ^ punctuation.separator.namespace.sublime-settings +// ^ punctuation.separator.namespace.sublime-settings +// ^ punctuation.separator.namespace.sublime-settings +// ^ punctuation.definition.string.end.json + "package_name.setting": null // ^^^^^^^^^^^^^^^^^^^^ entity.name.other.key.sublime-settings // ^^^^^^^^^^^^^ keyword.other.namespace.sublime-settings