From 332865aa916d0ced7072644cf6e71e5367d53bfc Mon Sep 17 00:00:00 2001 From: sebthom Date: Thu, 18 Sep 2025 13:38:06 +0200 Subject: [PATCH 01/21] ci: add required permission to bump-version workflow --- .github/workflows/bump-version.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/bump-version.yml b/.github/workflows/bump-version.yml index cc0a07ab9..43a36530a 100644 --- a/.github/workflows/bump-version.yml +++ b/.github/workflows/bump-version.yml @@ -28,6 +28,9 @@ jobs: ########################################################### runs-on: ubuntu-latest + permissions: + contents: write + steps: - name: "Show: GitHub context" env: From 0c98bb52a873b515fb230007f5016d4d81b83971 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Thu, 18 Sep 2025 11:38:37 +0000 Subject: [PATCH 02/21] set tm4e version to 0.15.2-SNAPSHOT --- org.eclipse.tm4e.core.tests/META-INF/MANIFEST.MF | 2 +- org.eclipse.tm4e.core.tests/pom.xml | 2 +- org.eclipse.tm4e.core/META-INF/MANIFEST.MF | 2 +- org.eclipse.tm4e.core/pom.xml | 2 +- org.eclipse.tm4e.feature/feature.xml | 2 +- org.eclipse.tm4e.feature/pom.xml | 2 +- org.eclipse.tm4e.language_pack.feature/feature.xml | 2 +- org.eclipse.tm4e.language_pack.feature/pom.xml | 2 +- org.eclipse.tm4e.language_pack/META-INF/MANIFEST.MF | 8 ++++---- org.eclipse.tm4e.language_pack/pom.xml | 2 +- org.eclipse.tm4e.language_pack/updater/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.tm4e.languageconfiguration.tests/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 8 ++++---- org.eclipse.tm4e.languageconfiguration/pom.xml | 2 +- org.eclipse.tm4e.markdown/META-INF/MANIFEST.MF | 8 ++++---- org.eclipse.tm4e.markdown/pom.xml | 2 +- org.eclipse.tm4e.registry/META-INF/MANIFEST.MF | 4 ++-- org.eclipse.tm4e.registry/pom.xml | 2 +- org.eclipse.tm4e.repository/pom.xml | 2 +- org.eclipse.tm4e.samples/META-INF/MANIFEST.MF | 6 +++--- org.eclipse.tm4e.samples/pom.xml | 2 +- org.eclipse.tm4e.ui.tests/META-INF/MANIFEST.MF | 2 +- org.eclipse.tm4e.ui.tests/pom.xml | 2 +- org.eclipse.tm4e.ui/META-INF/MANIFEST.MF | 6 +++--- org.eclipse.tm4e.ui/pom.xml | 2 +- pom.xml | 2 +- 27 files changed, 41 insertions(+), 41 deletions(-) diff --git a/org.eclipse.tm4e.core.tests/META-INF/MANIFEST.MF b/org.eclipse.tm4e.core.tests/META-INF/MANIFEST.MF index ef1d3ca79..5b3ed02a8 100644 --- a/org.eclipse.tm4e.core.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.tm4e.core.tests/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-Localization: plugin Bundle-SymbolicName: org.eclipse.tm4e.core.tests;singleton:=true -Bundle-Version: 0.15.1.qualifier +Bundle-Version: 0.15.2.qualifier Require-Bundle: org.apache.batik.css, org.apache.batik.util, com.google.gson, diff --git a/org.eclipse.tm4e.core.tests/pom.xml b/org.eclipse.tm4e.core.tests/pom.xml index b28974ef4..51541f140 100644 --- a/org.eclipse.tm4e.core.tests/pom.xml +++ b/org.eclipse.tm4e.core.tests/pom.xml @@ -5,7 +5,7 @@ org.eclipse org.eclipse.tm4e - 0.15.1-SNAPSHOT + 0.15.2-SNAPSHOT org.eclipse.tm4e.core.tests diff --git a/org.eclipse.tm4e.core/META-INF/MANIFEST.MF b/org.eclipse.tm4e.core/META-INF/MANIFEST.MF index b9a2a5a40..ba913817c 100644 --- a/org.eclipse.tm4e.core/META-INF/MANIFEST.MF +++ b/org.eclipse.tm4e.core/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-Localization: plugin Bundle-SymbolicName: org.eclipse.tm4e.core -Bundle-Version: 0.15.1.qualifier +Bundle-Version: 0.15.2.qualifier Require-Bundle: com.google.gson;bundle-version="[2.13.1,3.0.0)", org.apache.batik.css;bundle-version="[1.19.0,2.0.0)", org.apache.batik.util;bundle-version="[1.19.0,2.0.0)", diff --git a/org.eclipse.tm4e.core/pom.xml b/org.eclipse.tm4e.core/pom.xml index fbe020823..adfa1aeb6 100644 --- a/org.eclipse.tm4e.core/pom.xml +++ b/org.eclipse.tm4e.core/pom.xml @@ -5,7 +5,7 @@ org.eclipse org.eclipse.tm4e - 0.15.1-SNAPSHOT + 0.15.2-SNAPSHOT org.eclipse.tm4e.core diff --git a/org.eclipse.tm4e.feature/feature.xml b/org.eclipse.tm4e.feature/feature.xml index baa1d42e0..29f3fc47b 100644 --- a/org.eclipse.tm4e.feature/feature.xml +++ b/org.eclipse.tm4e.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.tm4e.feature/pom.xml b/org.eclipse.tm4e.feature/pom.xml index c42e73a8a..363d09d79 100644 --- a/org.eclipse.tm4e.feature/pom.xml +++ b/org.eclipse.tm4e.feature/pom.xml @@ -5,7 +5,7 @@ org.eclipse org.eclipse.tm4e - 0.15.1-SNAPSHOT + 0.15.2-SNAPSHOT org.eclipse.tm4e.feature diff --git a/org.eclipse.tm4e.language_pack.feature/feature.xml b/org.eclipse.tm4e.language_pack.feature/feature.xml index 41ba56070..38183910a 100644 --- a/org.eclipse.tm4e.language_pack.feature/feature.xml +++ b/org.eclipse.tm4e.language_pack.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.tm4e.language_pack.feature/pom.xml b/org.eclipse.tm4e.language_pack.feature/pom.xml index ef5deb5c1..886a8dc55 100644 --- a/org.eclipse.tm4e.language_pack.feature/pom.xml +++ b/org.eclipse.tm4e.language_pack.feature/pom.xml @@ -5,7 +5,7 @@ org.eclipse org.eclipse.tm4e - 0.15.1-SNAPSHOT + 0.15.2-SNAPSHOT org.eclipse.tm4e.language_pack.feature diff --git a/org.eclipse.tm4e.language_pack/META-INF/MANIFEST.MF b/org.eclipse.tm4e.language_pack/META-INF/MANIFEST.MF index c8cfe9f69..91d8040a3 100644 --- a/org.eclipse.tm4e.language_pack/META-INF/MANIFEST.MF +++ b/org.eclipse.tm4e.language_pack/META-INF/MANIFEST.MF @@ -4,10 +4,10 @@ Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-Localization: plugin Bundle-SymbolicName: org.eclipse.tm4e.language_pack;singleton:=true -Bundle-Version: 0.15.1.qualifier -Require-Bundle: org.eclipse.tm4e.ui;bundle-version="0.15.1", - org.eclipse.tm4e.registry;bundle-version="0.15.1", - org.eclipse.tm4e.languageconfiguration;bundle-version="0.15.1", +Bundle-Version: 0.15.2.qualifier +Require-Bundle: org.eclipse.tm4e.ui;bundle-version="0.15.2", + org.eclipse.tm4e.registry;bundle-version="0.15.2", + org.eclipse.tm4e.languageconfiguration;bundle-version="0.15.2", org.eclipse.ui.editors;bundle-version="[3.3.0,4.0.0)", org.eclipse.ui.genericeditor;bundle-version="[1.0.0,2.0.0)", org.eclipse.core.contenttype;bundle-version="[3.2.0,4.0.0)", diff --git a/org.eclipse.tm4e.language_pack/pom.xml b/org.eclipse.tm4e.language_pack/pom.xml index 62064977c..3bceb39d2 100644 --- a/org.eclipse.tm4e.language_pack/pom.xml +++ b/org.eclipse.tm4e.language_pack/pom.xml @@ -5,7 +5,7 @@ org.eclipse org.eclipse.tm4e - 0.15.1-SNAPSHOT + 0.15.2-SNAPSHOT org.eclipse.tm4e.language_pack diff --git a/org.eclipse.tm4e.language_pack/updater/pom.xml b/org.eclipse.tm4e.language_pack/updater/pom.xml index d18800653..3407cf529 100644 --- a/org.eclipse.tm4e.language_pack/updater/pom.xml +++ b/org.eclipse.tm4e.language_pack/updater/pom.xml @@ -9,7 +9,7 @@ org.eclipse org.eclipse.tm4e - 0.15.1-SNAPSHOT + 0.15.2-SNAPSHOT ../.. diff --git a/org.eclipse.tm4e.languageconfiguration.tests/META-INF/MANIFEST.MF b/org.eclipse.tm4e.languageconfiguration.tests/META-INF/MANIFEST.MF index 7a27cc3a8..e6665e7ae 100644 --- a/org.eclipse.tm4e.languageconfiguration.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.tm4e.languageconfiguration.tests/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Tests for TM4E language configuration support Bundle-SymbolicName: org.eclipse.tm4e.languageconfiguration.tests;singleton:=true -Bundle-Version: 0.15.1.qualifier +Bundle-Version: 0.15.2.qualifier Bundle-Vendor: Eclipse TM4E Automatic-Module-Name: org.eclipse.tm4e.languageconfiguration.tests Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.tm4e.languageconfiguration.tests/pom.xml b/org.eclipse.tm4e.languageconfiguration.tests/pom.xml index 50cf50978..57d2527c4 100644 --- a/org.eclipse.tm4e.languageconfiguration.tests/pom.xml +++ b/org.eclipse.tm4e.languageconfiguration.tests/pom.xml @@ -5,7 +5,7 @@ org.eclipse org.eclipse.tm4e - 0.15.1-SNAPSHOT + 0.15.2-SNAPSHOT org.eclipse.tm4e.languageconfiguration.tests diff --git a/org.eclipse.tm4e.languageconfiguration/META-INF/MANIFEST.MF b/org.eclipse.tm4e.languageconfiguration/META-INF/MANIFEST.MF index e544692c4..767d776de 100644 --- a/org.eclipse.tm4e.languageconfiguration/META-INF/MANIFEST.MF +++ b/org.eclipse.tm4e.languageconfiguration/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-Localization: plugin Bundle-SymbolicName: org.eclipse.tm4e.languageconfiguration;singleton:=true -Bundle-Version: 0.15.1.qualifier +Bundle-Version: 0.15.2.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: org.eclipse.core.expressions, org.eclipse.core.filebuffers, @@ -17,9 +17,9 @@ Require-Bundle: org.eclipse.core.expressions, org.eclipse.ui.genericeditor, org.eclipse.ui.ide, org.eclipse.e4.ui.css.swt.theme, - org.eclipse.tm4e.registry;bundle-version="0.15.1", - org.eclipse.tm4e.core;bundle-version="0.15.1", - org.eclipse.tm4e.ui;bundle-version="0.15.1", + org.eclipse.tm4e.registry;bundle-version="0.15.2", + org.eclipse.tm4e.core;bundle-version="0.15.2", + org.eclipse.tm4e.ui;bundle-version="0.15.2", com.google.gson;bundle-version="[2.10.1,3.0.0)" Bundle-Activator: org.eclipse.tm4e.languageconfiguration.LanguageConfigurationPlugin Export-Package: org.eclipse.tm4e.languageconfiguration, diff --git a/org.eclipse.tm4e.languageconfiguration/pom.xml b/org.eclipse.tm4e.languageconfiguration/pom.xml index e84e92f5c..c2bdfee75 100644 --- a/org.eclipse.tm4e.languageconfiguration/pom.xml +++ b/org.eclipse.tm4e.languageconfiguration/pom.xml @@ -5,7 +5,7 @@ org.eclipse org.eclipse.tm4e - 0.15.1-SNAPSHOT + 0.15.2-SNAPSHOT org.eclipse.tm4e.languageconfiguration diff --git a/org.eclipse.tm4e.markdown/META-INF/MANIFEST.MF b/org.eclipse.tm4e.markdown/META-INF/MANIFEST.MF index 931552d42..17fbabae4 100644 --- a/org.eclipse.tm4e.markdown/META-INF/MANIFEST.MF +++ b/org.eclipse.tm4e.markdown/META-INF/MANIFEST.MF @@ -4,11 +4,11 @@ Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-Localization: plugin Bundle-SymbolicName: org.eclipse.tm4e.markdown;singleton:=true -Bundle-Version: 0.15.1.qualifier +Bundle-Version: 0.15.2.qualifier Require-Bundle: org.eclipse.core.runtime, - org.eclipse.tm4e.core;bundle-version="0.15.1", - org.eclipse.tm4e.registry;bundle-version="0.15.1", - org.eclipse.tm4e.ui;bundle-version="0.15.1" + org.eclipse.tm4e.core;bundle-version="0.15.2", + org.eclipse.tm4e.registry;bundle-version="0.15.2", + org.eclipse.tm4e.ui;bundle-version="0.15.2" Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.tm4e.markdown, org.eclipse.tm4e.markdown.marked diff --git a/org.eclipse.tm4e.markdown/pom.xml b/org.eclipse.tm4e.markdown/pom.xml index 7dcfeaed5..4140f2e24 100644 --- a/org.eclipse.tm4e.markdown/pom.xml +++ b/org.eclipse.tm4e.markdown/pom.xml @@ -5,7 +5,7 @@ org.eclipse org.eclipse.tm4e - 0.15.1-SNAPSHOT + 0.15.2-SNAPSHOT org.eclipse.tm4e.markdown diff --git a/org.eclipse.tm4e.registry/META-INF/MANIFEST.MF b/org.eclipse.tm4e.registry/META-INF/MANIFEST.MF index f389d3c20..684bdb2e1 100644 --- a/org.eclipse.tm4e.registry/META-INF/MANIFEST.MF +++ b/org.eclipse.tm4e.registry/META-INF/MANIFEST.MF @@ -3,11 +3,11 @@ Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-SymbolicName: org.eclipse.tm4e.registry;singleton:=true -Bundle-Version: 0.15.1.qualifier +Bundle-Version: 0.15.2.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: org.eclipse.core.runtime, org.eclipse.equinox.preferences, - org.eclipse.tm4e.core;bundle-version="0.15.1", + org.eclipse.tm4e.core;bundle-version="0.15.2", com.google.gson;bundle-version="[2.13.1,3.0.0)" Export-Package: org.eclipse.tm4e.registry Bundle-Activator: org.eclipse.tm4e.registry.TMEclipseRegistryPlugin diff --git a/org.eclipse.tm4e.registry/pom.xml b/org.eclipse.tm4e.registry/pom.xml index bbfa0bc89..0b034698f 100644 --- a/org.eclipse.tm4e.registry/pom.xml +++ b/org.eclipse.tm4e.registry/pom.xml @@ -5,7 +5,7 @@ org.eclipse org.eclipse.tm4e - 0.15.1-SNAPSHOT + 0.15.2-SNAPSHOT org.eclipse.tm4e.registry diff --git a/org.eclipse.tm4e.repository/pom.xml b/org.eclipse.tm4e.repository/pom.xml index a753d5368..cf543f56e 100644 --- a/org.eclipse.tm4e.repository/pom.xml +++ b/org.eclipse.tm4e.repository/pom.xml @@ -5,7 +5,7 @@ org.eclipse org.eclipse.tm4e - 0.15.1-SNAPSHOT + 0.15.2-SNAPSHOT org.eclipse.tm4e.repository diff --git a/org.eclipse.tm4e.samples/META-INF/MANIFEST.MF b/org.eclipse.tm4e.samples/META-INF/MANIFEST.MF index 27c1f9c5a..ba3638095 100644 --- a/org.eclipse.tm4e.samples/META-INF/MANIFEST.MF +++ b/org.eclipse.tm4e.samples/META-INF/MANIFEST.MF @@ -4,14 +4,14 @@ Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-Localization: plugin Bundle-SymbolicName: org.eclipse.tm4e.samples;singleton:=true -Bundle-Version: 0.15.1.qualifier +Bundle-Version: 0.15.2.qualifier Require-Bundle: org.eclipse.jface.text, org.eclipse.core.runtime, org.eclipse.ui, org.eclipse.ui.editors, org.eclipse.ui.genericeditor;bundle-version="1.0.0";resolution:=optional, - org.eclipse.tm4e.core;bundle-version="0.15.1", - org.eclipse.tm4e.ui;bundle-version="0.15.1" + org.eclipse.tm4e.core;bundle-version="0.15.2", + org.eclipse.tm4e.ui;bundle-version="0.15.2" Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-ActivationPolicy: lazy Automatic-Module-Name: org.eclipse.tm4e.samples diff --git a/org.eclipse.tm4e.samples/pom.xml b/org.eclipse.tm4e.samples/pom.xml index 0b4a7347f..9e76fc2df 100644 --- a/org.eclipse.tm4e.samples/pom.xml +++ b/org.eclipse.tm4e.samples/pom.xml @@ -4,7 +4,7 @@ org.eclipse org.eclipse.tm4e - 0.15.1-SNAPSHOT + 0.15.2-SNAPSHOT org.eclipse.tm4e.samples diff --git a/org.eclipse.tm4e.ui.tests/META-INF/MANIFEST.MF b/org.eclipse.tm4e.ui.tests/META-INF/MANIFEST.MF index 9b1c1db59..f191a79d2 100644 --- a/org.eclipse.tm4e.ui.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.tm4e.ui.tests/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-Localization: plugin Bundle-SymbolicName: org.eclipse.tm4e.ui.tests;singleton:=true -Bundle-Version: 0.15.1.qualifier +Bundle-Version: 0.15.2.qualifier Require-Bundle: org.eclipse.jface.text, org.eclipse.core.filesystem, org.eclipse.core.resources, diff --git a/org.eclipse.tm4e.ui.tests/pom.xml b/org.eclipse.tm4e.ui.tests/pom.xml index 3f35d25c2..a4da4ee85 100644 --- a/org.eclipse.tm4e.ui.tests/pom.xml +++ b/org.eclipse.tm4e.ui.tests/pom.xml @@ -5,7 +5,7 @@ org.eclipse org.eclipse.tm4e - 0.15.1-SNAPSHOT + 0.15.2-SNAPSHOT org.eclipse.tm4e.ui.tests diff --git a/org.eclipse.tm4e.ui/META-INF/MANIFEST.MF b/org.eclipse.tm4e.ui/META-INF/MANIFEST.MF index 0b15b01fd..24406f9f3 100644 --- a/org.eclipse.tm4e.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.tm4e.ui/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-Localization: plugin Bundle-SymbolicName: org.eclipse.tm4e.ui;singleton:=true -Bundle-Version: 0.15.1.qualifier +Bundle-Version: 0.15.2.qualifier Require-Bundle: org.eclipse.core.expressions, org.eclipse.core.filesystem, org.eclipse.core.resources, @@ -16,8 +16,8 @@ Require-Bundle: org.eclipse.core.expressions, org.eclipse.ui.trace;resolution:=optional, org.eclipse.ui.workbench.texteditor, org.eclipse.e4.ui.css.swt.theme, - org.eclipse.tm4e.core;bundle-version="0.15.1", - org.eclipse.tm4e.registry;bundle-version="0.15.1", + org.eclipse.tm4e.core;bundle-version="0.15.2", + org.eclipse.tm4e.registry;bundle-version="0.15.2", com.google.gson;bundle-version="[2.13.1,3.0.0)" Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.tm4e.ui, diff --git a/org.eclipse.tm4e.ui/pom.xml b/org.eclipse.tm4e.ui/pom.xml index 9bd38566d..101044512 100644 --- a/org.eclipse.tm4e.ui/pom.xml +++ b/org.eclipse.tm4e.ui/pom.xml @@ -5,7 +5,7 @@ org.eclipse org.eclipse.tm4e - 0.15.1-SNAPSHOT + 0.15.2-SNAPSHOT org.eclipse.tm4e.ui diff --git a/pom.xml b/pom.xml index 03df1e793..484c9d153 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.eclipse org.eclipse.tm4e - 0.15.1-SNAPSHOT + 0.15.2-SNAPSHOT pom From 82f84816b679086ba8a8a31961547ac444f2f8e7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 22 Sep 2025 11:23:03 +0000 Subject: [PATCH 03/21] fix(deps): bump org.apache.maven.plugins:maven-javadoc-plugin Bumps [org.apache.maven.plugins:maven-javadoc-plugin](https://github.com/apache/maven-javadoc-plugin) from 3.11.3 to 3.12.0. - [Release notes](https://github.com/apache/maven-javadoc-plugin/releases) - [Commits](https://github.com/apache/maven-javadoc-plugin/compare/maven-javadoc-plugin-3.11.3...maven-javadoc-plugin-3.12.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-javadoc-plugin dependency-version: 3.12.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 484c9d153..2efb68db9 100644 --- a/pom.xml +++ b/pom.xml @@ -330,7 +330,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.11.3 + 3.12.0 true From 5b2eb958165bdf1aceb057d3f47c95bb6d101d83 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 22 Sep 2025 11:21:06 +0000 Subject: [PATCH 04/21] fix(deps): bump org.apache.maven.plugins:maven-compiler-plugin Bumps [org.apache.maven.plugins:maven-compiler-plugin](https://github.com/apache/maven-compiler-plugin) from 3.14.0 to 3.14.1. - [Release notes](https://github.com/apache/maven-compiler-plugin/releases) - [Commits](https://github.com/apache/maven-compiler-plugin/compare/maven-compiler-plugin-3.14.0...maven-compiler-plugin-3.14.1) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-compiler-plugin dependency-version: 3.14.1 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2efb68db9..7b6164ab7 100644 --- a/pom.xml +++ b/pom.xml @@ -184,7 +184,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.14.0 + 3.14.1 compiletests From a91a40ae2216e359bc59a5a3869cc7a181b74af9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 30 Sep 2025 11:11:01 +0000 Subject: [PATCH 05/21] fix(deps): bump org.codehaus.mojo:exec-maven-plugin from 3.5.1 to 3.6.0 Bumps [org.codehaus.mojo:exec-maven-plugin](https://github.com/mojohaus/exec-maven-plugin) from 3.5.1 to 3.6.0. - [Release notes](https://github.com/mojohaus/exec-maven-plugin/releases) - [Commits](https://github.com/mojohaus/exec-maven-plugin/compare/3.5.1...3.6.0) --- updated-dependencies: - dependency-name: org.codehaus.mojo:exec-maven-plugin dependency-version: 3.6.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- org.eclipse.tm4e.core/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/org.eclipse.tm4e.core/pom.xml b/org.eclipse.tm4e.core/pom.xml index adfa1aeb6..055b9cc6a 100644 --- a/org.eclipse.tm4e.core/pom.xml +++ b/org.eclipse.tm4e.core/pom.xml @@ -39,7 +39,7 @@ org.codehaus.mojo exec-maven-plugin - 3.5.1 + 3.6.0 integration-test From b23103988bbe68365d43f00c29f7cbb752c32b35 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 30 Sep 2025 11:10:45 +0000 Subject: [PATCH 06/21] fix(deps): bump org.junit.jupiter:junit-jupiter-engine Bumps [org.junit.jupiter:junit-jupiter-engine](https://github.com/junit-team/junit-framework) from 5.13.4 to 6.0.0. - [Release notes](https://github.com/junit-team/junit-framework/releases) - [Commits](https://github.com/junit-team/junit-framework/compare/r5.13.4...r6.0.0) --- updated-dependencies: - dependency-name: org.junit.jupiter:junit-jupiter-engine dependency-version: 6.0.0 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7b6164ab7..f3be22708 100644 --- a/pom.xml +++ b/pom.xml @@ -158,7 +158,7 @@ org.junit.jupiter junit-jupiter-engine - 5.13.4 + 6.0.0 From 4ce5b210b3532a8af75511a2bff66e56eace190a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 6 Oct 2025 11:56:10 +0000 Subject: [PATCH 07/21] fix(deps): bump org.codehaus.mojo:exec-maven-plugin from 3.6.0 to 3.6.1 Bumps [org.codehaus.mojo:exec-maven-plugin](https://github.com/mojohaus/exec-maven-plugin) from 3.6.0 to 3.6.1. - [Release notes](https://github.com/mojohaus/exec-maven-plugin/releases) - [Commits](https://github.com/mojohaus/exec-maven-plugin/compare/3.6.0...3.6.1) --- updated-dependencies: - dependency-name: org.codehaus.mojo:exec-maven-plugin dependency-version: 3.6.1 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- org.eclipse.tm4e.core/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/org.eclipse.tm4e.core/pom.xml b/org.eclipse.tm4e.core/pom.xml index 055b9cc6a..6a061e98d 100644 --- a/org.eclipse.tm4e.core/pom.xml +++ b/org.eclipse.tm4e.core/pom.xml @@ -39,7 +39,7 @@ org.codehaus.mojo exec-maven-plugin - 3.6.0 + 3.6.1 integration-test From 46e25c4fcd089729d66ecf86a6560c1e502b3a09 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 3 Oct 2025 11:09:36 +0000 Subject: [PATCH 08/21] fix(deps): bump org.apache.maven.plugins:maven-enforcer-plugin Bumps [org.apache.maven.plugins:maven-enforcer-plugin](https://github.com/apache/maven-enforcer) from 3.6.1 to 3.6.2. - [Release notes](https://github.com/apache/maven-enforcer/releases) - [Commits](https://github.com/apache/maven-enforcer/compare/enforcer-3.6.1...enforcer-3.6.2) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-enforcer-plugin dependency-version: 3.6.2 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f3be22708..a5944b7f6 100644 --- a/pom.xml +++ b/pom.xml @@ -77,7 +77,7 @@ org.apache.maven.plugins maven-enforcer-plugin - 3.6.1 + 3.6.2 enforce From 1783f502b91529bd73135da5aaae72496a73f971 Mon Sep 17 00:00:00 2001 From: sebthom Date: Mon, 22 Sep 2025 14:01:03 +0200 Subject: [PATCH 09/21] fix: improve OnigRegExp.rewritePatternIfRequired --- .../core/internal/oniguruma/OnigRegExp.java | 152 +++++++++++++++--- 1 file changed, 131 insertions(+), 21 deletions(-) diff --git a/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/internal/oniguruma/OnigRegExp.java b/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/internal/oniguruma/OnigRegExp.java index ec07f24d3..0170b2e94 100644 --- a/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/internal/oniguruma/OnigRegExp.java +++ b/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/internal/oniguruma/OnigRegExp.java @@ -93,37 +93,147 @@ private Regex parsePattern(final String pattern, final boolean ignoreCase) throw } /** - * Rewrites the given pattern to workaround limitations of the joni library which for example does not support - * negative variable-length look-behinds + * Rewrites the given pattern to work around limitations of the Joni library, which does not support variable-length lookbehinds. * - * @see github.com/eclipse-tm4e/tm4e/issue/677 + * Strategy: + *
    + *
  • Fixed-length lookbehind (positive or negative) is supported by Joni → leave unchanged.
    • + *
  • Variable-length POSITIVE lookbehind at the pattern start → rewritten by consuming the context:
    + * (?<=X)Y ⇒ (?:X)Y
    + * Trade-off: the overall match (group(0)) shifts left and now includes X, but capture groups remain intact.
    • + *
  • Variable-length NEGATIVE lookbehind → no safe generic rewrite (changing it would alter semantics). + * These are left unchanged, except for a handful of known safe special cases handled explicitly.
    • + *
+ * + * @see github.com/eclipse-tm4e/tm4e/issues/677 */ private String rewritePatternIfRequired(final String pattern) { + if (pattern.isEmpty()) + return pattern; - // e.g. used in csharp.tmLanguage.json - final var lookbehind1 = "(? (?:X)Y + // (group numbering is preserved; only group(0) widens to include X). + if (pattern.startsWith("(?<=")) { + final int close = findBalancedGroupEnd(pattern, 0); // index of ')' closing (?<=...) + if (close > 0) { + final String body = pattern.substring("(?<=".length(), close); + + if (isFixedLength(body)) + return pattern; // supported as-is - // e.g. used in markdown.math.block.tmLanguage.json and tex.tmLanguage.json - final var lookbehind2 = "(?<=^\\s*)"; - if (pattern.startsWith(lookbehind2)) { - return "(?<=^)\\s*" + pattern.substring(lookbehind2.length()); + // Variable-length positive lookbehind: consume the prefix so the pattern runs on Joni. + return "(?:" + body + ")" + pattern.substring(close + 1); + } + // Unbalanced (?<=... → leave unchanged } - // e.g. used in carbon.tmLanguage.json - final var lookbehind3 = "(?<=\\s*\\.)"; - if (pattern.startsWith(lookbehind3)) { - return "\\s*\\." + pattern.substring(lookbehind3.length()); + // --- Negative lookbehinds -------------------------------------------------- + // We intentionally DO NOT apply a generic rewrite for variable-length NEGATIVE lookbehind: + // - Fixed-length negative LB is Joni-compatible → leave unchanged. + // - Variable-length negative LB has no semantics-preserving generic rewrite. + // If you encounter real-world cases, add targeted rewrites below. + + // Used in csharp.tmLanguage.json: (? (? Date: Mon, 22 Sep 2025 14:03:15 +0200 Subject: [PATCH 10/21] feat: update language pack grammars --- org.eclipse.tm4e.language_pack/README.md | 120 +- org.eclipse.tm4e.language_pack/about.html | 126 +- org.eclipse.tm4e.language_pack/plugin.xml | 6 +- .../csharp/csharp.language-configuration.json | 32 +- .../syntaxes/csharp/csharp.tmLanguage.json | 10 +- .../syntaxes/fsharp/fsharp.tmLanguage.json | 27 +- .../syntaxes/go/go.tmLanguage.json | 394 ++++-- .../syntaxes/html/html.tmLanguage.json | 2 +- .../javascript.language-configuration.json | 10 +- ...avascriptreact.language-configuration.json | 10 +- .../syntaxes/julia/julia.tmLanguage.json | 4 +- .../syntaxes/latex/bibtex.tmLanguage.json | 351 +++--- .../syntaxes/latex/latex.tmLanguage.json | 1103 ++++++++++++++--- .../markdown_latex_combined.tmLanguage.json | 2 +- .../syntaxes/latex/tex.tmLanguage.json | 217 ++-- .../make/makefile.language-configuration.json | 5 +- .../markdown/markdown.tmLanguage.json | 184 ++- .../php/php.language-configuration.json | 9 +- .../syntaxes/php/php.tmLanguage.json | 198 +-- .../syntaxes/r/r.tmLanguage.json | 976 +++++++++------ .../syntaxes/razor/razor.tmLanguage.json | 8 +- .../syntaxes/ruby/ruby.tmLanguage.json | 122 +- .../syntaxes/rust/rust.tmLanguage.json | 6 +- .../syntaxes/sql/sql.tmLanguage.json | 16 +- .../syntaxes/swift/swift.tmLanguage.json | 52 +- .../typescript.language-configuration.json | 10 +- ...ypescriptreact.language-configuration.json | 10 +- .../updater/updater-config.yaml | 7 +- .../updater/updater-state.yaml | 221 ++-- 29 files changed, 2867 insertions(+), 1371 deletions(-) diff --git a/org.eclipse.tm4e.language_pack/README.md b/org.eclipse.tm4e.language_pack/README.md index 3c3c84eed..f70af1386 100644 --- a/org.eclipse.tm4e.language_pack/README.md +++ b/org.eclipse.tm4e.language_pack/README.md @@ -22,66 +22,66 @@ for the [Eclipse IDE](https://eclipseide.org). | Language/Format | File Associations | Source |:--------------- |:----------------- |:------ | -| ASP.NET Razor | file-extensions="cshtml, razor" | [1.98.2@microsoft/vscode](https://github.com/microsoft/vscode/tree/ddc367ed5c8936efe395cffeec279b04ffd7db78/extensions/razor) [[upstream]](https://github.com/dotnet/razor/commit/9b1e979b6c3fe7cfbe30f595b9b0994d20bd482c) -| Batch File | file-extensions="bat, cmd" | [1.98.2@microsoft/vscode](https://github.com/microsoft/vscode/tree/ddc367ed5c8936efe395cffeec279b04ffd7db78/extensions/bat) [[upstream]](https://github.com/mmims/language-batchfile/commit/6154ae25a24e01ac9329e7bcf958e093cd8733a9) -| BibTeX | file-extensions="bib" | [1.98.2@microsoft/vscode](https://github.com/microsoft/vscode/tree/ddc367ed5c8936efe395cffeec279b04ffd7db78/extensions/latex) [[upstream]](https://github.com/jlelong/vscode-latex-basics/commit/c787db94a56bd93131ce0938046063320a02cc73) -| C | file-extensions="c, i" | [1.98.2@microsoft/vscode](https://github.com/microsoft/vscode/tree/ddc367ed5c8936efe395cffeec279b04ffd7db78/extensions/cpp) [[upstream]](https://github.com/jeff-hykin/better-c-syntax/commit/34712a6106a4ffb0a04d2fa836fd28ff6c5849a4) -| C# | file-extensions="cake, cs, csx" | [1.98.2@microsoft/vscode](https://github.com/microsoft/vscode/tree/ddc367ed5c8936efe395cffeec279b04ffd7db78/extensions/csharp) [[upstream]](https://github.com/dotnet/csharp-tmLanguage/commit/62026a70f9fcc42d9222eccfec34ed5ee0784f3d) -| C++ | file-extensions="c++, c++m, cc, ccm, cpp, cppm, cxx, cxxm, h, h++, h.in, hh, hpp, hpp.in, hxx, ii, inl, ino, ipp, ixx, tpp, txx" | [1.98.2@microsoft/vscode](https://github.com/microsoft/vscode/tree/ddc367ed5c8936efe395cffeec279b04ffd7db78/extensions/cpp) [[upstream]](https://github.com/jeff-hykin/better-cpp-syntax/commit/f1d127a8af2b184db570345f0bb179503c47fdf6) -| Clojure | file-extensions="clj, cljc, cljs, cljx, clojure, edn" | [1.98.2@microsoft/vscode](https://github.com/microsoft/vscode/tree/ddc367ed5c8936efe395cffeec279b04ffd7db78/extensions/clojure) [[upstream]](https://github.com/atom/language-clojure/commit/45bdb881501d0b8f8b707ca1d3fcc8b4b99fca03) -| Code Snippets | file-extensions="code-snippets"
file-patterns="\*\*/User/profiles/\*/snippets/\*.json, \*\*/User/snippets/\*.json" | [1.98.2@microsoft/vscode](https://github.com/microsoft/vscode/tree/ddc367ed5c8936efe395cffeec279b04ffd7db78/extensions/json) [[upstream]](https://github.com/jeff-hykin/better-snippet-syntax/commit/2b1bb124cb2b9c75c3c80eae1b8f3a043841d654) -| CoffeeScript | file-extensions="coffee, cson, iced" | [1.98.2@microsoft/vscode](https://github.com/microsoft/vscode/tree/ddc367ed5c8936efe395cffeec279b04ffd7db78/extensions/coffeescript) [[upstream]](https://github.com/atom/language-coffee-script/commit/0f6db9143663e18b1ad00667820f46747dba495e) -| CSS | file-extensions="css" | [1.98.2@microsoft/vscode](https://github.com/microsoft/vscode/tree/ddc367ed5c8936efe395cffeec279b04ffd7db78/extensions/css) [[upstream]](https://github.com/microsoft/vscode-css/commit/a927fe2f73927bf5c25d0b0c4dd0e63d69fd8887) -| CUDA C++ | file-extensions="cu, cuh" | [1.98.2@microsoft/vscode](https://github.com/microsoft/vscode/tree/ddc367ed5c8936efe395cffeec279b04ffd7db78/extensions/cpp) [[upstream]](https://github.com/NVIDIA/cuda-cpp-grammar/commit/81e88eaec5170aa8585736c63627c73e3589998c) -| Dart | file-extensions="dart" | [1.98.2@microsoft/vscode](https://github.com/microsoft/vscode/tree/ddc367ed5c8936efe395cffeec279b04ffd7db78/extensions/dart) [[upstream]](https://github.com/dart-lang/dart-syntax-highlight/commit/e1ac5c446c2531343393adbe8fff9d45d8a7c412) -| Diff | file-extensions="diff, patch, rej" | [1.98.2@microsoft/vscode](https://github.com/microsoft/vscode/tree/ddc367ed5c8936efe395cffeec279b04ffd7db78/extensions/diff) [[upstream]](https://github.com/textmate/diff.tmbundle/commit/0593bb775eab1824af97ef2172fd38822abd97d7) -| Docker | file-extensions="containerfile, dockerfile"
file-names="Containerfile, Dockerfile"
file-patterns="Containerfile.\*, Dockerfile.\*" | [1.98.2@microsoft/vscode](https://github.com/microsoft/vscode/tree/ddc367ed5c8936efe395cffeec279b04ffd7db78/extensions/docker) [[upstream]](https://github.com/moby/moby/commit/c2029cb2574647e4bc28ed58486b8e85883eedb9) -| F# | file-extensions="fs, fsi, fsscript, fsx" | [1.98.2@microsoft/vscode](https://github.com/microsoft/vscode/tree/ddc367ed5c8936efe395cffeec279b04ffd7db78/extensions/fsharp) [[upstream]](https://github.com/ionide/ionide-fsgrammar/commit/c62c78404d0b2c14816aae61ac0688663a5990a3) -| Git Commit Message | file-names="COMMIT_EDITMSG, MERGE_MSG" | [1.98.2@microsoft/vscode](https://github.com/microsoft/vscode/tree/ddc367ed5c8936efe395cffeec279b04ffd7db78/extensions/git-base) [[upstream]](https://github.com/walles/git-commit-message-plus/commit/35a079dea5a91b087021b40c01a6bb4eb0337a87) -| Git Ignore | file-extensions="git-blame-ignore-revs, gitignore, gitignore_global"
file-names=".gitignore" | [1.98.2@microsoft/vscode](https://github.com/microsoft/vscode/tree/ddc367ed5c8936efe395cffeec279b04ffd7db78/extensions/git-base) -| Git Rebase Message | file-names="git-rebase-todo"
file-patterns="\*\*/rebase-merge/done" | [1.98.2@microsoft/vscode](https://github.com/microsoft/vscode/tree/ddc367ed5c8936efe395cffeec279b04ffd7db78/extensions/git-base) [[upstream]](https://github.com/textmate/git.tmbundle/commit/5870cf3f8abad3a6637bdf69250b5d2ded427dc4) -| Go | file-extensions="go" | [1.98.2@microsoft/vscode](https://github.com/microsoft/vscode/tree/ddc367ed5c8936efe395cffeec279b04ffd7db78/extensions/go) [[upstream]](https://github.com/worlpaker/go-syntax/commit/fbdaec061157e98dda185c0ce771ce6a2c793045) -| Groovy | file-extensions="gradle, groovy, gvy, jenkinsfile, nf"
file-names="Jenkinsfile"
file-patterns="Jenkinsfile\*" | [1.98.2@microsoft/vscode](https://github.com/microsoft/vscode/tree/ddc367ed5c8936efe395cffeec279b04ffd7db78/extensions/groovy) [[upstream]](https://github.com/textmate/groovy.tmbundle/commit/85d8f7c97ae473ccb9473f6c8d27e4ec957f4be1) -| Handlebars | file-extensions="handlebars, hbs, hjs" | [1.98.2@microsoft/vscode](https://github.com/microsoft/vscode/tree/ddc367ed5c8936efe395cffeec279b04ffd7db78/extensions/handlebars) [[upstream]](https://github.com/daaain/Handlebars/commit/85a153a6f759df4e8da7533e1b3651f007867c51) -| HLSL (High-Level Shader Language) | file-extensions="cginc, compute, fx, fxh, hlsl, hlsli, psh, vsh" | [1.98.2@microsoft/vscode](https://github.com/microsoft/vscode/tree/ddc367ed5c8936efe395cffeec279b04ffd7db78/extensions/hlsl) [[upstream]](https://github.com/tgjones/shaders-tmLanguage/commit/87c0dca3a39170dbd7ee7e277db4f915fb2de14a) -| HTML | file-extensions="asp, aspx, ejs, htm, html, jshtm, jsp, mdoc, rhtml, shtml, volt, xht, xhtml" | [1.98.2@microsoft/vscode](https://github.com/microsoft/vscode/tree/ddc367ed5c8936efe395cffeec279b04ffd7db78/extensions/html) [[upstream]](https://github.com/textmate/html.tmbundle/commit/390c8870273a2ae80244dae6db6ba064a802f407) -| INI Config File | file-extensions="ini" | [1.98.2@microsoft/vscode](https://github.com/microsoft/vscode/tree/ddc367ed5c8936efe395cffeec279b04ffd7db78/extensions/ini) [[upstream]](https://github.com/textmate/ini.tmbundle/commit/2af0cbb0704940f967152616f2f1ff0aae6287a6) -| Java | file-extensions="jav, java" | [1.98.2@microsoft/vscode](https://github.com/microsoft/vscode/tree/ddc367ed5c8936efe395cffeec279b04ffd7db78/extensions/java) [[upstream]](https://github.com/redhat-developer/vscode-java/commit/f09b712f5d6d6339e765f58c8dfab3f78a378183) -| JavaScript | file-extensions="cjs, es6, js, mjs, pac"
file-names="jakefile" | [1.98.2@microsoft/vscode](https://github.com/microsoft/vscode/tree/ddc367ed5c8936efe395cffeec279b04ffd7db78/extensions/javascript) [[upstream]](https://github.com/microsoft/TypeScript-TmLanguage/commit/48f608692aa6d6ad7bd65b478187906c798234a8) -| JavaScript JSX | file-extensions="jsx" | [1.98.2@microsoft/vscode](https://github.com/microsoft/vscode/tree/ddc367ed5c8936efe395cffeec279b04ffd7db78/extensions/javascript) [[upstream]](https://github.com/microsoft/TypeScript-TmLanguage/commit/48f608692aa6d6ad7bd65b478187906c798234a8) -| JSON | file-extensions="bowerrc, css.map, geojson, har, ipynb, js.map, jscsrc, jslintrc, json, jsonld, ts.map, vuerc, webmanifest"
file-names=".watchmanconfig, composer.lock" | [1.98.2@microsoft/vscode](https://github.com/microsoft/vscode/tree/ddc367ed5c8936efe395cffeec279b04ffd7db78/extensions/json) [[upstream]](https://github.com/microsoft/vscode-JSON.tmLanguage/commit/9bd83f1c252b375e957203f21793316203f61f70) -| JSON Lines | file-extensions="jsonl, ndjson" | [1.98.2@microsoft/vscode](https://github.com/microsoft/vscode/tree/ddc367ed5c8936efe395cffeec279b04ffd7db78/extensions/json) [[upstream]](https://github.com/microsoft/vscode-JSON.tmLanguage/commit/9bd83f1c252b375e957203f21793316203f61f70) -| JSON with Comments | file-extensions="babelrc, eslintrc, eslintrc.json, hintrc, jsfmtrc, jshintrc, jsonc, swcrc"
file-names=".babelrc.json, .ember-cli, babel.config.json, bun.lock, typedoc.json" | [1.98.2@microsoft/vscode](https://github.com/microsoft/vscode/tree/ddc367ed5c8936efe395cffeec279b04ffd7db78/extensions/json) [[upstream]](https://github.com/microsoft/vscode-JSON.tmLanguage/commit/9bd83f1c252b375e957203f21793316203f61f70) -| Julia | file-extensions="jl" | [1.98.2@microsoft/vscode](https://github.com/microsoft/vscode/tree/ddc367ed5c8936efe395cffeec279b04ffd7db78/extensions/julia) [[upstream]](https://github.com/JuliaEditorSupport/atom-language-julia/commit/c686684f18153687886e7d19c1bfc3a33076b1ab) -| LaTeX | file-extensions="ctx, ltx, tex" | [1.98.2@microsoft/vscode](https://github.com/microsoft/vscode/tree/ddc367ed5c8936efe395cffeec279b04ffd7db78/extensions/latex) [[upstream]](https://github.com/jlelong/vscode-latex-basics/commit/7a35f5e0f19b28f5f1366579e2a9ad34df4f40c9) -| Less | file-extensions="less" | [1.98.2@microsoft/vscode](https://github.com/microsoft/vscode/tree/ddc367ed5c8936efe395cffeec279b04ffd7db78/extensions/less) [[upstream]](https://github.com/radium-v/Better-Less/commit/63c0cba9792e49e255cce0f6dd03250fb30591e6) -| Lua | file-extensions="lua" | [1.98.2@microsoft/vscode](https://github.com/microsoft/vscode/tree/ddc367ed5c8936efe395cffeec279b04ffd7db78/extensions/lua) [[upstream]](https://github.com/sumneko/lua.tmbundle/commit/1483add845ebfb3e1e631fe372603e5fed2cdd42) -| Makefile | file-extensions="mak, mk"
file-names="GNUmakefile, Makefile, OCamlMakefile, makefile" | [1.98.2@microsoft/vscode](https://github.com/microsoft/vscode/tree/ddc367ed5c8936efe395cffeec279b04ffd7db78/extensions/make) [[upstream]](https://github.com/fadeevab/make.tmbundle/commit/1d4c0b541959995db098df751ffc129da39a294b) -| Markdown | file-extensions="markdn, markdown, md, mdown, mdtext, mdtxt, mdwn, mkd, workbook" | [1.98.2@microsoft/vscode](https://github.com/microsoft/vscode/tree/ddc367ed5c8936efe395cffeec279b04ffd7db78/extensions/markdown-basics) [[upstream]](https://github.com/microsoft/vscode-markdown-tm-grammar/commit/7418dd20d76c72e82fadee2909e03239e9973b35) -| MS SQL | file-extensions="dsql, sql" | [1.98.2@microsoft/vscode](https://github.com/microsoft/vscode/tree/ddc367ed5c8936efe395cffeec279b04ffd7db78/extensions/sql) [[upstream]](https://github.com/microsoft/vscode-mssql/commit/49eff02f68b6ee73025c6665c672ca1c93385dde) -| Objective-C | file-extensions="m" | [1.98.2@microsoft/vscode](https://github.com/microsoft/vscode/tree/ddc367ed5c8936efe395cffeec279b04ffd7db78/extensions/objective-c) [[upstream]](https://github.com/jeff-hykin/better-objc-syntax/commit/119b75fb1f4d3e8726fa62588e3b935e0b719294) -| Objective-C++ | file-extensions="mm" | [1.98.2@microsoft/vscode](https://github.com/microsoft/vscode/tree/ddc367ed5c8936efe395cffeec279b04ffd7db78/extensions/objective-c) [[upstream]](https://github.com/jeff-hykin/better-objcpp-syntax/commit/5a7eb15eee382dd5aa388bc04fdb60a0d2128e14) -| Perl | file-extensions="PL, pl, pm, pod, psgi, t" | [1.98.2@microsoft/vscode](https://github.com/microsoft/vscode/tree/ddc367ed5c8936efe395cffeec279b04ffd7db78/extensions/perl) [[upstream]](https://github.com/textmate/perl.tmbundle/commit/a85927a902d6e5d7805f56a653f324d34dfad53a) -| PHP | file-extensions="ctp, php, php4, php5, phtml" | [1.98.2@microsoft/vscode](https://github.com/microsoft/vscode/tree/ddc367ed5c8936efe395cffeec279b04ffd7db78/extensions/php) [[upstream]](https://github.com/KapitanOczywisty/language-php/commit/5e8f000cb5a20f44f7a7a89d07ad0774031c53f3) -| PowerShell | file-extensions="ps1, psd1, psm1, psrc, pssc" | [1.98.2@microsoft/vscode](https://github.com/microsoft/vscode/tree/ddc367ed5c8936efe395cffeec279b04ffd7db78/extensions/powershell) [[upstream]](https://github.com/PowerShell/EditorSyntax/commit/742f0b5d4b60f5930c0b47fcc1f646860521296e) -| Pug | file-extensions="jade, pug" | [1.98.2@microsoft/vscode](https://github.com/microsoft/vscode/tree/ddc367ed5c8936efe395cffeec279b04ffd7db78/extensions/pug) [[upstream]](https://github.com/davidrios/pug-tmbundle/commit/ae1dd60ca4aa4b45617f236d584216cd8d19eecf) -| Python | file-extensions="cpy, gyp, gypi, ipy, py, pyi, pyt, pyw, rpy"
file-names="SConscript, SConstruct" | [1.98.2@microsoft/vscode](https://github.com/microsoft/vscode/tree/ddc367ed5c8936efe395cffeec279b04ffd7db78/extensions/python) [[upstream]](https://github.com/MagicStack/MagicPython/commit/7d0f2b22a5ad8fccbd7341bc7b7a715169283044) -| R | file-extensions="r, rhistory, rprofile, rt" | [1.98.2@microsoft/vscode](https://github.com/microsoft/vscode/tree/ddc367ed5c8936efe395cffeec279b04ffd7db78/extensions/r) [[upstream]](https://github.com/REditorSupport/vscode-R/commit/c937cdd39982995d8ee1f1125919f7c2d150b35d) -| Raku (Perl 6) | file-extensions="nqp, p6, pl6, pm6, raku, rakudoc, rakumod, rakutest" | [1.98.2@microsoft/vscode](https://github.com/microsoft/vscode/tree/ddc367ed5c8936efe395cffeec279b04ffd7db78/extensions/perl) [[upstream]](https://github.com/textmate/perl.tmbundle/commit/d9841a0878239fa43f88c640f8d458590f97e8f5) -| reStructuredText | file-extensions="rst" | [1.98.2@microsoft/vscode](https://github.com/microsoft/vscode/tree/ddc367ed5c8936efe395cffeec279b04ffd7db78/extensions/restructuredtext) [[upstream]](https://github.com/trond-snekvik/vscode-rst/commit/7f2d6bb4e20642b60f2979afcb594cfe4b48117a) -| Ruby | file-extensions="erb, gemspec, podspec, rake, rb, rbi, rbx, rjs, ru"
file-names="appfile, appraisals, berksfile, berksfile.lock, brewfile, capfile, cheffile, dangerfile, deliverfile, fastfile, gemfile, guardfile, gymfile, hobofile, matchfile, podfile, puppetfile, rakefile, rantfile, scanfile, snapfile, thorfile, vagrantfile" | [1.98.2@microsoft/vscode](https://github.com/microsoft/vscode/tree/ddc367ed5c8936efe395cffeec279b04ffd7db78/extensions/ruby) [[upstream]](https://github.com/Shopify/ruby-lsp/commit/01a8ecf608b7d8607adcd89c32db72ae3852f33b) -| Rust | file-extensions="rs" | [1.98.2@microsoft/vscode](https://github.com/microsoft/vscode/tree/ddc367ed5c8936efe395cffeec279b04ffd7db78/extensions/rust) [[upstream]](https://github.com/dustypomerleau/rust-syntax/commit/e90d3dbdb61b96e4afdce6f7a3572426b1a86d9d) -| SCSS | file-extensions="scss" | [1.98.2@microsoft/vscode](https://github.com/microsoft/vscode/tree/ddc367ed5c8936efe395cffeec279b04ffd7db78/extensions/scss) [[upstream]](https://github.com/atom/language-sass/commit/f52ab12f7f9346cc2568129d8c4419bd3d506b47) -| ShaderLab | file-extensions="shader" | [1.98.2@microsoft/vscode](https://github.com/microsoft/vscode/tree/ddc367ed5c8936efe395cffeec279b04ffd7db78/extensions/shaderlab) [[upstream]](https://github.com/tgjones/shaders-tmLanguage/commit/c72c8b39380ba5a86c58ceed053b5d965ebf38b3) -| Shell Script | file-extensions="Xsession, bash, bash_aliases, bash_login, bash_logout, bash_profile, bashrc, csh, cshrc, ebuild, eclass, fish, ksh, profile, sh, tcshrc, xprofile, xsession, xsessionrc, yash_profile, yashrc, zlogin, zlogout, zprofile, zsh, zsh-theme, zshenv, zshrc"
file-names=".envrc, .hushlogin, APKBUILD, PKGBUILD, bashrc_Apple_Terminal, zlogin, zlogout, zprofile, zshenv, zshrc, zshrc_Apple_Terminal"
file-patterns=".env.\*" | [1.98.2@microsoft/vscode](https://github.com/microsoft/vscode/tree/ddc367ed5c8936efe395cffeec279b04ffd7db78/extensions/shellscript) [[upstream]](https://github.com/jeff-hykin/better-shell-syntax/commit/35020b0bd79a90d3b262b4c13a8bb0b33adc1f45) -| Swift | file-extensions="swift" | [1.98.2@microsoft/vscode](https://github.com/microsoft/vscode/tree/ddc367ed5c8936efe395cffeec279b04ffd7db78/extensions/swift) [[upstream]](https://github.com/jtbandes/swift-tmlanguage/commit/b8d2889b4af1d8bad41578317a6adade642555a3) -| TeX | file-extensions="bbx, cbx, cls, sty" | [1.98.2@microsoft/vscode](https://github.com/microsoft/vscode/tree/ddc367ed5c8936efe395cffeec279b04ffd7db78/extensions/latex) [[upstream]](https://github.com/jlelong/vscode-latex-basics/commit/df6ef817c932d24da5cc72927344a547e463cc65) -| TypeScript | file-extensions="cts, mts, ts" | [1.98.2@microsoft/vscode](https://github.com/microsoft/vscode/tree/ddc367ed5c8936efe395cffeec279b04ffd7db78/extensions/typescript-basics) [[upstream]](https://github.com/microsoft/TypeScript-TmLanguage/commit/48f608692aa6d6ad7bd65b478187906c798234a8) -| TypeScript JSX | file-extensions="tsx" | [1.98.2@microsoft/vscode](https://github.com/microsoft/vscode/tree/ddc367ed5c8936efe395cffeec279b04ffd7db78/extensions/typescript-basics) [[upstream]](https://github.com/microsoft/TypeScript-TmLanguage/commit/48f608692aa6d6ad7bd65b478187906c798234a8) -| Visual Basic | file-extensions="bas, brs, vb, vba, vbs" | [1.98.2@microsoft/vscode](https://github.com/microsoft/vscode/tree/ddc367ed5c8936efe395cffeec279b04ffd7db78/extensions/vb) [[upstream]](https://github.com/textmate/asp.vb.net.tmbundle/commit/72d44550b3286d0382d7be0624140cf97857ff69) -| VS Code Search Result | file-extensions="code-search" | [1.98.2@microsoft/vscode](https://github.com/microsoft/vscode/tree/ddc367ed5c8936efe395cffeec279b04ffd7db78/extensions/search-result) -| XML | file-extensions="ascx, atom, axaml, axml, bpmn, cpt, csl, csproj, csproj.user, dita, ditamap, dtd, dtml, ent, fsproj, fxml, iml, isml, jmx, launch, menu, mod, mxml, nuspec, opml, owl, proj, props, pt, publishsettings, pubxml, pubxml.user, rbxlx, rbxmx, rdf, rng, rss, shproj, storyboard, svg, targets, tld, tmx, vbproj, vbproj.user, vcxproj, vcxproj.filters, wsdl, wxi, wxl, wxs, xaml, xbl, xib, xlf, xliff, xml, xoml, xpdl, xsd, xul" | [1.98.2@microsoft/vscode](https://github.com/microsoft/vscode/tree/ddc367ed5c8936efe395cffeec279b04ffd7db78/extensions/xml) [[upstream]](https://github.com/atom/language-xml/commit/7bc75dfe779ad5b35d9bf4013d9181864358cb49) -| XSL | file-extensions="xsl, xslt" | [1.98.2@microsoft/vscode](https://github.com/microsoft/vscode/tree/ddc367ed5c8936efe395cffeec279b04ffd7db78/extensions/xml) [[upstream]](https://github.com/atom/language-xml/commit/507de2ee7daca60cf02e9e21fbeb92bbae73e280) +| ASP.NET Razor | file-extensions="cshtml, razor" | [1.104.0@microsoft/vscode](https://github.com/microsoft/vscode/tree/f220831ea2d946c0dcb0f3eaa480eb435a2c1260/extensions/razor) [[upstream]](https://github.com/dotnet/razor/commit/9b1e979b6c3fe7cfbe30f595b9b0994d20bd482c) +| Batch File | file-extensions="bat, cmd" | [1.104.0@microsoft/vscode](https://github.com/microsoft/vscode/tree/f220831ea2d946c0dcb0f3eaa480eb435a2c1260/extensions/bat) [[upstream]](https://github.com/mmims/language-batchfile/commit/6154ae25a24e01ac9329e7bcf958e093cd8733a9) +| BibTeX | file-extensions="bib" | [1.104.0@microsoft/vscode](https://github.com/microsoft/vscode/tree/f220831ea2d946c0dcb0f3eaa480eb435a2c1260/extensions/latex) [[upstream]](https://github.com/jlelong/vscode-latex-basics/commit/0fcf9283828cab2aa611072f54feb1e7d501c2b4) +| C | file-extensions="c, i" | [1.104.0@microsoft/vscode](https://github.com/microsoft/vscode/tree/f220831ea2d946c0dcb0f3eaa480eb435a2c1260/extensions/cpp) [[upstream]](https://github.com/jeff-hykin/better-c-syntax/commit/34712a6106a4ffb0a04d2fa836fd28ff6c5849a4) +| C# | file-extensions="cake, cs, csx" | [1.104.0@microsoft/vscode](https://github.com/microsoft/vscode/tree/f220831ea2d946c0dcb0f3eaa480eb435a2c1260/extensions/csharp) [[upstream]](https://github.com/dotnet/csharp-tmLanguage/commit/1381bedfb087c18aca67af8278050d11bc9d9349) +| C++ | file-extensions="c++, c++m, cc, ccm, cpp, cppm, cxx, cxxm, h, h++, h.in, hh, hpp, hpp.in, hxx, ii, inl, ino, ipp, ixx, tpp, txx" | [1.104.0@microsoft/vscode](https://github.com/microsoft/vscode/tree/f220831ea2d946c0dcb0f3eaa480eb435a2c1260/extensions/cpp) [[upstream]](https://github.com/jeff-hykin/better-cpp-syntax/commit/f1d127a8af2b184db570345f0bb179503c47fdf6) +| Clojure | file-extensions="clj, cljc, cljs, cljx, clojure, edn" | [1.104.0@microsoft/vscode](https://github.com/microsoft/vscode/tree/f220831ea2d946c0dcb0f3eaa480eb435a2c1260/extensions/clojure) [[upstream]](https://github.com/atom/language-clojure/commit/45bdb881501d0b8f8b707ca1d3fcc8b4b99fca03) +| Code Snippets | file-extensions="code-snippets"
file-patterns="\*\*/User/profiles/\*/snippets/\*.json, \*\*/User/snippets/\*.json, \*\*/snippets\*.json" | [1.104.0@microsoft/vscode](https://github.com/microsoft/vscode/tree/f220831ea2d946c0dcb0f3eaa480eb435a2c1260/extensions/json) [[upstream]](https://github.com/jeff-hykin/better-snippet-syntax/commit/2b1bb124cb2b9c75c3c80eae1b8f3a043841d654) +| CoffeeScript | file-extensions="coffee, cson, iced" | [1.104.0@microsoft/vscode](https://github.com/microsoft/vscode/tree/f220831ea2d946c0dcb0f3eaa480eb435a2c1260/extensions/coffeescript) [[upstream]](https://github.com/atom/language-coffee-script/commit/0f6db9143663e18b1ad00667820f46747dba495e) +| CSS | file-extensions="css" | [1.104.0@microsoft/vscode](https://github.com/microsoft/vscode/tree/f220831ea2d946c0dcb0f3eaa480eb435a2c1260/extensions/css) [[upstream]](https://github.com/microsoft/vscode-css/commit/a927fe2f73927bf5c25d0b0c4dd0e63d69fd8887) +| CUDA C++ | file-extensions="cu, cuh" | [1.104.0@microsoft/vscode](https://github.com/microsoft/vscode/tree/f220831ea2d946c0dcb0f3eaa480eb435a2c1260/extensions/cpp) [[upstream]](https://github.com/NVIDIA/cuda-cpp-grammar/commit/81e88eaec5170aa8585736c63627c73e3589998c) +| Dart | file-extensions="dart" | [1.104.0@microsoft/vscode](https://github.com/microsoft/vscode/tree/f220831ea2d946c0dcb0f3eaa480eb435a2c1260/extensions/dart) [[upstream]](https://github.com/dart-lang/dart-syntax-highlight/commit/e1ac5c446c2531343393adbe8fff9d45d8a7c412) +| Diff | file-extensions="diff, patch, rej" | [1.104.0@microsoft/vscode](https://github.com/microsoft/vscode/tree/f220831ea2d946c0dcb0f3eaa480eb435a2c1260/extensions/diff) [[upstream]](https://github.com/textmate/diff.tmbundle/commit/0593bb775eab1824af97ef2172fd38822abd97d7) +| Docker | file-extensions="containerfile, dockerfile"
file-names="Containerfile, Dockerfile"
file-patterns="Containerfile.\*, Dockerfile.\*" | [1.104.0@microsoft/vscode](https://github.com/microsoft/vscode/tree/f220831ea2d946c0dcb0f3eaa480eb435a2c1260/extensions/docker) [[upstream]](https://github.com/moby/moby/commit/c2029cb2574647e4bc28ed58486b8e85883eedb9) +| F# | file-extensions="fs, fsi, fsscript, fsx" | [1.104.0@microsoft/vscode](https://github.com/microsoft/vscode/tree/f220831ea2d946c0dcb0f3eaa480eb435a2c1260/extensions/fsharp) [[upstream]](https://github.com/ionide/ionide-fsgrammar/commit/be3c51d2c28d3aaacd89ecd067e766bebe387f89) +| Git Commit Message | file-names="COMMIT_EDITMSG, MERGE_MSG" | [1.104.0@microsoft/vscode](https://github.com/microsoft/vscode/tree/f220831ea2d946c0dcb0f3eaa480eb435a2c1260/extensions/git-base) [[upstream]](https://github.com/walles/git-commit-message-plus/commit/35a079dea5a91b087021b40c01a6bb4eb0337a87) +| Git Ignore | file-extensions="git-blame-ignore-revs, gitignore, gitignore_global"
file-names=".gitignore" | [1.104.0@microsoft/vscode](https://github.com/microsoft/vscode/tree/f220831ea2d946c0dcb0f3eaa480eb435a2c1260/extensions/git-base) +| Git Rebase Message | file-names="git-rebase-todo"
file-patterns="\*\*/rebase-merge/done" | [1.104.0@microsoft/vscode](https://github.com/microsoft/vscode/tree/f220831ea2d946c0dcb0f3eaa480eb435a2c1260/extensions/git-base) [[upstream]](https://github.com/textmate/git.tmbundle/commit/5870cf3f8abad3a6637bdf69250b5d2ded427dc4) +| Go | file-extensions="go" | [1.104.0@microsoft/vscode](https://github.com/microsoft/vscode/tree/f220831ea2d946c0dcb0f3eaa480eb435a2c1260/extensions/go) [[upstream]](https://github.com/worlpaker/go-syntax/commit/8c70c078f56d237f72574ce49cc95839c4f8a741) +| Groovy | file-extensions="gradle, groovy, gvy, jenkinsfile, nf"
file-names="Jenkinsfile"
file-patterns="Jenkinsfile\*" | [1.104.0@microsoft/vscode](https://github.com/microsoft/vscode/tree/f220831ea2d946c0dcb0f3eaa480eb435a2c1260/extensions/groovy) [[upstream]](https://github.com/textmate/groovy.tmbundle/commit/85d8f7c97ae473ccb9473f6c8d27e4ec957f4be1) +| Handlebars | file-extensions="handlebars, hbs, hjs" | [1.104.0@microsoft/vscode](https://github.com/microsoft/vscode/tree/f220831ea2d946c0dcb0f3eaa480eb435a2c1260/extensions/handlebars) [[upstream]](https://github.com/daaain/Handlebars/commit/85a153a6f759df4e8da7533e1b3651f007867c51) +| HLSL (High-Level Shader Language) | file-extensions="cginc, compute, fx, fxh, hlsl, hlsli, psh, vsh" | [1.104.0@microsoft/vscode](https://github.com/microsoft/vscode/tree/f220831ea2d946c0dcb0f3eaa480eb435a2c1260/extensions/hlsl) [[upstream]](https://github.com/tgjones/shaders-tmLanguage/commit/87c0dca3a39170dbd7ee7e277db4f915fb2de14a) +| HTML | file-extensions="asp, aspx, ejs, htm, html, jshtm, jsp, mdoc, rhtml, shtml, volt, xht, xhtml" | [1.104.0@microsoft/vscode](https://github.com/microsoft/vscode/tree/f220831ea2d946c0dcb0f3eaa480eb435a2c1260/extensions/html) [[upstream]](https://github.com/textmate/html.tmbundle/commit/390c8870273a2ae80244dae6db6ba064a802f407) +| INI Config File | file-extensions="ini" | [1.104.0@microsoft/vscode](https://github.com/microsoft/vscode/tree/f220831ea2d946c0dcb0f3eaa480eb435a2c1260/extensions/ini) [[upstream]](https://github.com/textmate/ini.tmbundle/commit/2af0cbb0704940f967152616f2f1ff0aae6287a6) +| Java | file-extensions="jav, java" | [1.104.0@microsoft/vscode](https://github.com/microsoft/vscode/tree/f220831ea2d946c0dcb0f3eaa480eb435a2c1260/extensions/java) [[upstream]](https://github.com/redhat-developer/vscode-java/commit/f09b712f5d6d6339e765f58c8dfab3f78a378183) +| JavaScript | file-extensions="cjs, es6, js, mjs, pac"
file-names="jakefile" | [1.104.0@microsoft/vscode](https://github.com/microsoft/vscode/tree/f220831ea2d946c0dcb0f3eaa480eb435a2c1260/extensions/javascript) [[upstream]](https://github.com/microsoft/TypeScript-TmLanguage/commit/48f608692aa6d6ad7bd65b478187906c798234a8) +| JavaScript JSX | file-extensions="jsx" | [1.104.0@microsoft/vscode](https://github.com/microsoft/vscode/tree/f220831ea2d946c0dcb0f3eaa480eb435a2c1260/extensions/javascript) [[upstream]](https://github.com/microsoft/TypeScript-TmLanguage/commit/48f608692aa6d6ad7bd65b478187906c798234a8) +| JSON | file-extensions="bowerrc, css.map, geojson, har, ipynb, js.map, jscsrc, jslintrc, json, jsonld, ts.map, vuerc, webmanifest"
file-names=".watchmanconfig, composer.lock" | [1.104.0@microsoft/vscode](https://github.com/microsoft/vscode/tree/f220831ea2d946c0dcb0f3eaa480eb435a2c1260/extensions/json) [[upstream]](https://github.com/microsoft/vscode-JSON.tmLanguage/commit/9bd83f1c252b375e957203f21793316203f61f70) +| JSON Lines | file-extensions="jsonl, ndjson" | [1.104.0@microsoft/vscode](https://github.com/microsoft/vscode/tree/f220831ea2d946c0dcb0f3eaa480eb435a2c1260/extensions/json) [[upstream]](https://github.com/microsoft/vscode-JSON.tmLanguage/commit/9bd83f1c252b375e957203f21793316203f61f70) +| JSON with Comments | file-extensions="babelrc, eslintrc, eslintrc.json, hintrc, jsfmtrc, jshintrc, jsonc, swcrc, toolset.jsonc"
file-names=".babelrc.json, .ember-cli, babel.config.json, bun.lock, typedoc.json" | [1.104.0@microsoft/vscode](https://github.com/microsoft/vscode/tree/f220831ea2d946c0dcb0f3eaa480eb435a2c1260/extensions/json) [[upstream]](https://github.com/microsoft/vscode-JSON.tmLanguage/commit/9bd83f1c252b375e957203f21793316203f61f70) +| Julia | file-extensions="jl" | [1.104.0@microsoft/vscode](https://github.com/microsoft/vscode/tree/f220831ea2d946c0dcb0f3eaa480eb435a2c1260/extensions/julia) [[upstream]](https://github.com/JuliaEditorSupport/atom-language-julia/commit/111548fbd25d083ec131d2732a4f46953ea92a65) +| LaTeX | file-extensions="ctx, ltx, tex" | [1.104.0@microsoft/vscode](https://github.com/microsoft/vscode/tree/f220831ea2d946c0dcb0f3eaa480eb435a2c1260/extensions/latex) [[upstream]](https://github.com/jlelong/vscode-latex-basics/commit/e5d3d4b46731ed37119a5296c12eee7669284eeb) +| Less | file-extensions="less" | [1.104.0@microsoft/vscode](https://github.com/microsoft/vscode/tree/f220831ea2d946c0dcb0f3eaa480eb435a2c1260/extensions/less) [[upstream]](https://github.com/radium-v/Better-Less/commit/63c0cba9792e49e255cce0f6dd03250fb30591e6) +| Lua | file-extensions="lua" | [1.104.0@microsoft/vscode](https://github.com/microsoft/vscode/tree/f220831ea2d946c0dcb0f3eaa480eb435a2c1260/extensions/lua) [[upstream]](https://github.com/sumneko/lua.tmbundle/commit/1483add845ebfb3e1e631fe372603e5fed2cdd42) +| Makefile | file-extensions="mak, mk"
file-names="GNUmakefile, Makefile, OCamlMakefile, makefile" | [1.104.0@microsoft/vscode](https://github.com/microsoft/vscode/tree/f220831ea2d946c0dcb0f3eaa480eb435a2c1260/extensions/make) [[upstream]](https://github.com/fadeevab/make.tmbundle/commit/1d4c0b541959995db098df751ffc129da39a294b) +| Markdown | file-extensions="markdn, markdown, md, mdown, mdtext, mdtxt, mdwn, mkd, workbook" | [1.104.0@microsoft/vscode](https://github.com/microsoft/vscode/tree/f220831ea2d946c0dcb0f3eaa480eb435a2c1260/extensions/markdown-basics) [[upstream]](https://github.com/microsoft/vscode-markdown-tm-grammar/commit/0812fc4b190efc17bfed0d5b4ff918eff8e4e377) +| MS SQL | file-extensions="dsql, sql" | [1.104.0@microsoft/vscode](https://github.com/microsoft/vscode/tree/f220831ea2d946c0dcb0f3eaa480eb435a2c1260/extensions/sql) [[upstream]](https://github.com/microsoft/vscode-mssql/commit/ff0c7d3b3582100856fe5b839663b2a8704dc4e4) +| Objective-C | file-extensions="m" | [1.104.0@microsoft/vscode](https://github.com/microsoft/vscode/tree/f220831ea2d946c0dcb0f3eaa480eb435a2c1260/extensions/objective-c) [[upstream]](https://github.com/jeff-hykin/better-objc-syntax/commit/119b75fb1f4d3e8726fa62588e3b935e0b719294) +| Objective-C++ | file-extensions="mm" | [1.104.0@microsoft/vscode](https://github.com/microsoft/vscode/tree/f220831ea2d946c0dcb0f3eaa480eb435a2c1260/extensions/objective-c) [[upstream]](https://github.com/jeff-hykin/better-objcpp-syntax/commit/5a7eb15eee382dd5aa388bc04fdb60a0d2128e14) +| Perl | file-extensions="PL, pl, pm, pod, psgi, t" | [1.104.0@microsoft/vscode](https://github.com/microsoft/vscode/tree/f220831ea2d946c0dcb0f3eaa480eb435a2c1260/extensions/perl) [[upstream]](https://github.com/textmate/perl.tmbundle/commit/a85927a902d6e5d7805f56a653f324d34dfad53a) +| PHP | file-extensions="ctp, php, php4, php5, phtml" | [1.104.0@microsoft/vscode](https://github.com/microsoft/vscode/tree/f220831ea2d946c0dcb0f3eaa480eb435a2c1260/extensions/php) [[upstream]](https://github.com/KapitanOczywisty/language-php/commit/b17fdadac1756fc13a0853c26fca2f0b4495c0bd) +| PowerShell | file-extensions="ps1, psd1, psm1, psrc, pssc" | [1.104.0@microsoft/vscode](https://github.com/microsoft/vscode/tree/f220831ea2d946c0dcb0f3eaa480eb435a2c1260/extensions/powershell) [[upstream]](https://github.com/PowerShell/EditorSyntax/commit/742f0b5d4b60f5930c0b47fcc1f646860521296e) +| Pug | file-extensions="jade, pug" | [1.104.0@microsoft/vscode](https://github.com/microsoft/vscode/tree/f220831ea2d946c0dcb0f3eaa480eb435a2c1260/extensions/pug) [[upstream]](https://github.com/davidrios/pug-tmbundle/commit/ae1dd60ca4aa4b45617f236d584216cd8d19eecf) +| Python | file-extensions="cpy, gyp, gypi, ipy, py, pyi, pyt, pyw, rpy"
file-names="SConscript, SConstruct" | [1.104.0@microsoft/vscode](https://github.com/microsoft/vscode/tree/f220831ea2d946c0dcb0f3eaa480eb435a2c1260/extensions/python) [[upstream]](https://github.com/MagicStack/MagicPython/commit/7d0f2b22a5ad8fccbd7341bc7b7a715169283044) +| R | file-extensions="r, rhistory, rprofile, rt" | [1.104.0@microsoft/vscode](https://github.com/microsoft/vscode/tree/f220831ea2d946c0dcb0f3eaa480eb435a2c1260/extensions/r) [[upstream]](https://github.com/REditorSupport/vscode-R-syntax/commit/b199996070723eefbe7a61e0384b2ae4768eb7f0) +| Raku (Perl 6) | file-extensions="nqp, p6, pl6, pm6, raku, rakudoc, rakumod, rakutest" | [1.104.0@microsoft/vscode](https://github.com/microsoft/vscode/tree/f220831ea2d946c0dcb0f3eaa480eb435a2c1260/extensions/perl) [[upstream]](https://github.com/textmate/perl.tmbundle/commit/d9841a0878239fa43f88c640f8d458590f97e8f5) +| reStructuredText | file-extensions="rst" | [1.104.0@microsoft/vscode](https://github.com/microsoft/vscode/tree/f220831ea2d946c0dcb0f3eaa480eb435a2c1260/extensions/restructuredtext) [[upstream]](https://github.com/trond-snekvik/vscode-rst/commit/7f2d6bb4e20642b60f2979afcb594cfe4b48117a) +| Ruby | file-extensions="erb, gemspec, podspec, rake, rb, rbi, rbx, rjs, ru"
file-names="appfile, appraisals, berksfile, berksfile.lock, brewfile, capfile, cheffile, dangerfile, deliverfile, fastfile, gemfile, guardfile, gymfile, hobofile, matchfile, podfile, puppetfile, rakefile, rantfile, scanfile, snapfile, thorfile, vagrantfile" | [1.104.0@microsoft/vscode](https://github.com/microsoft/vscode/tree/f220831ea2d946c0dcb0f3eaa480eb435a2c1260/extensions/ruby) [[upstream]](https://github.com/Shopify/ruby-lsp/commit/2d5552a22f71ac75086c7f03d404df51e23f6535) +| Rust | file-extensions="rs" | [1.104.0@microsoft/vscode](https://github.com/microsoft/vscode/tree/f220831ea2d946c0dcb0f3eaa480eb435a2c1260/extensions/rust) [[upstream]](https://github.com/dustypomerleau/rust-syntax/commit/268fd42cfd4aa96a6ed9024a2850d17d6cd2dc7b) +| SCSS | file-extensions="scss" | [1.104.0@microsoft/vscode](https://github.com/microsoft/vscode/tree/f220831ea2d946c0dcb0f3eaa480eb435a2c1260/extensions/scss) [[upstream]](https://github.com/atom/language-sass/commit/f52ab12f7f9346cc2568129d8c4419bd3d506b47) +| ShaderLab | file-extensions="shader" | [1.104.0@microsoft/vscode](https://github.com/microsoft/vscode/tree/f220831ea2d946c0dcb0f3eaa480eb435a2c1260/extensions/shaderlab) [[upstream]](https://github.com/tgjones/shaders-tmLanguage/commit/c72c8b39380ba5a86c58ceed053b5d965ebf38b3) +| Shell Script | file-extensions="Xsession, bash, bash_aliases, bash_login, bash_logout, bash_profile, bashrc, csh, cshrc, ebuild, eclass, fish, ksh, profile, sh, tcshrc, xprofile, xsession, xsessionrc, yash_profile, yashrc, zlogin, zlogout, zprofile, zsh, zsh-theme, zshenv, zshrc"
file-names=".envrc, .hushlogin, APKBUILD, PKGBUILD, bashrc_Apple_Terminal, zlogin, zlogout, zprofile, zshenv, zshrc, zshrc_Apple_Terminal"
file-patterns=".env.\*" | [1.104.0@microsoft/vscode](https://github.com/microsoft/vscode/tree/f220831ea2d946c0dcb0f3eaa480eb435a2c1260/extensions/shellscript) [[upstream]](https://github.com/jeff-hykin/better-shell-syntax/commit/35020b0bd79a90d3b262b4c13a8bb0b33adc1f45) +| Swift | file-extensions="swift" | [1.104.0@microsoft/vscode](https://github.com/microsoft/vscode/tree/f220831ea2d946c0dcb0f3eaa480eb435a2c1260/extensions/swift) [[upstream]](https://github.com/jtbandes/swift-tmlanguage/commit/0897d8939a82ddcf6533e9f318e5942b1265416b) +| TeX | file-extensions="bbx, cbx, cls, sty" | [1.104.0@microsoft/vscode](https://github.com/microsoft/vscode/tree/f220831ea2d946c0dcb0f3eaa480eb435a2c1260/extensions/latex) [[upstream]](https://github.com/jlelong/vscode-latex-basics/commit/6bd99800f7b2cbd0e36cecb56fe1936da5affadb) +| TypeScript | file-extensions="cts, mts, ts" | [1.104.0@microsoft/vscode](https://github.com/microsoft/vscode/tree/f220831ea2d946c0dcb0f3eaa480eb435a2c1260/extensions/typescript-basics) [[upstream]](https://github.com/microsoft/TypeScript-TmLanguage/commit/48f608692aa6d6ad7bd65b478187906c798234a8) +| TypeScript JSX | file-extensions="tsx" | [1.104.0@microsoft/vscode](https://github.com/microsoft/vscode/tree/f220831ea2d946c0dcb0f3eaa480eb435a2c1260/extensions/typescript-basics) [[upstream]](https://github.com/microsoft/TypeScript-TmLanguage/commit/48f608692aa6d6ad7bd65b478187906c798234a8) +| Visual Basic | file-extensions="bas, brs, vb, vba, vbs" | [1.104.0@microsoft/vscode](https://github.com/microsoft/vscode/tree/f220831ea2d946c0dcb0f3eaa480eb435a2c1260/extensions/vb) [[upstream]](https://github.com/textmate/asp.vb.net.tmbundle/commit/72d44550b3286d0382d7be0624140cf97857ff69) +| VS Code Search Result | file-extensions="code-search" | [1.104.0@microsoft/vscode](https://github.com/microsoft/vscode/tree/f220831ea2d946c0dcb0f3eaa480eb435a2c1260/extensions/search-result) +| XML | file-extensions="ascx, atom, axaml, axml, bpmn, cpt, csl, csproj, csproj.user, dita, ditamap, dtd, dtml, ent, fsproj, fxml, iml, isml, jmx, launch, menu, mod, mxml, nuspec, opml, owl, proj, props, pt, publishsettings, pubxml, pubxml.user, rbxlx, rbxmx, rdf, rng, rss, shproj, slnx, storyboard, svg, targets, tld, tmx, vbproj, vbproj.user, vcxproj, vcxproj.filters, wsdl, wxi, wxl, wxs, xaml, xbl, xib, xlf, xliff, xml, xoml, xpdl, xsd, xul" | [1.104.0@microsoft/vscode](https://github.com/microsoft/vscode/tree/f220831ea2d946c0dcb0f3eaa480eb435a2c1260/extensions/xml) [[upstream]](https://github.com/atom/language-xml/commit/7bc75dfe779ad5b35d9bf4013d9181864358cb49) +| XSL | file-extensions="xsl, xslt" | [1.104.0@microsoft/vscode](https://github.com/microsoft/vscode/tree/f220831ea2d946c0dcb0f3eaa480eb435a2c1260/extensions/xml) [[upstream]](https://github.com/atom/language-xml/commit/507de2ee7daca60cf02e9e21fbeb92bbae73e280) | YAML | file-extensions="cff, eyaml, eyml, winget, yaml, yaml-tmlanguage, yaml-tmpreferences, yaml-tmtheme, yml" | [1.96.1@microsoft/vscode](https://github.com/microsoft/vscode/tree/42b266171e51a016313f47d0c48aca9295b9cbb2/extensions/yaml) [[upstream]](https://github.com/textmate/yaml.tmbundle/commit/e54ceae3b719506dba7e481a77cea4a8b576ae46) diff --git a/org.eclipse.tm4e.language_pack/about.html b/org.eclipse.tm4e.language_pack/about.html index 8f127cbd1..8e279e82d 100644 --- a/org.eclipse.tm4e.language_pack/about.html +++ b/org.eclipse.tm4e.language_pack/about.html @@ -39,302 +39,302 @@

About This Content

ASP.NET Razor file-extensions="cshtml, razor" - 1.98.2@microsoft/vscode [upstream] + 1.104.0@microsoft/vscode [upstream] Batch File file-extensions="bat, cmd" - 1.98.2@microsoft/vscode [upstream] + 1.104.0@microsoft/vscode [upstream] BibTeX file-extensions="bib" - 1.98.2@microsoft/vscode [upstream] + 1.104.0@microsoft/vscode [upstream] C file-extensions="c, i" - 1.98.2@microsoft/vscode [upstream] + 1.104.0@microsoft/vscode [upstream] C# file-extensions="cake, cs, csx" - 1.98.2@microsoft/vscode [upstream] + 1.104.0@microsoft/vscode [upstream] C++ file-extensions="c++, c++m, cc, ccm, cpp, cppm, cxx, cxxm, h, h++, h.in, hh, hpp, hpp.in, hxx, ii, inl, ino, ipp, ixx, tpp, txx" - 1.98.2@microsoft/vscode [upstream] + 1.104.0@microsoft/vscode [upstream] Clojure file-extensions="clj, cljc, cljs, cljx, clojure, edn" - 1.98.2@microsoft/vscode [upstream] + 1.104.0@microsoft/vscode [upstream] Code Snippets - file-extensions="code-snippets"
file-patterns="**/User/profiles/*/snippets/*.json, **/User/snippets/*.json" - 1.98.2@microsoft/vscode [upstream] + file-extensions="code-snippets"
file-patterns="**/User/profiles/*/snippets/*.json, **/User/snippets/*.json, **/snippets*.json" + 1.104.0@microsoft/vscode [upstream] CoffeeScript file-extensions="coffee, cson, iced" - 1.98.2@microsoft/vscode [upstream] + 1.104.0@microsoft/vscode [upstream] CSS file-extensions="css" - 1.98.2@microsoft/vscode [upstream] + 1.104.0@microsoft/vscode [upstream] CUDA C++ file-extensions="cu, cuh" - 1.98.2@microsoft/vscode [upstream] + 1.104.0@microsoft/vscode [upstream] Dart file-extensions="dart" - 1.98.2@microsoft/vscode [upstream] + 1.104.0@microsoft/vscode [upstream] Diff file-extensions="diff, patch, rej" - 1.98.2@microsoft/vscode [upstream] + 1.104.0@microsoft/vscode [upstream] Docker file-extensions="containerfile, dockerfile"
file-names="Containerfile, Dockerfile"
file-patterns="Containerfile.*, Dockerfile.*" - 1.98.2@microsoft/vscode [upstream] + 1.104.0@microsoft/vscode [upstream] F# file-extensions="fs, fsi, fsscript, fsx" - 1.98.2@microsoft/vscode [upstream] + 1.104.0@microsoft/vscode [upstream] Git Commit Message file-names="COMMIT_EDITMSG, MERGE_MSG" - 1.98.2@microsoft/vscode [upstream] + 1.104.0@microsoft/vscode [upstream] Git Ignore file-extensions="git-blame-ignore-revs, gitignore, gitignore_global"
file-names=".gitignore" - 1.98.2@microsoft/vscode + 1.104.0@microsoft/vscode Git Rebase Message file-names="git-rebase-todo"
file-patterns="**/rebase-merge/done" - 1.98.2@microsoft/vscode [upstream] + 1.104.0@microsoft/vscode [upstream] Go file-extensions="go" - 1.98.2@microsoft/vscode [upstream] + 1.104.0@microsoft/vscode [upstream] Groovy file-extensions="gradle, groovy, gvy, jenkinsfile, nf"
file-names="Jenkinsfile"
file-patterns="Jenkinsfile*" - 1.98.2@microsoft/vscode [upstream] + 1.104.0@microsoft/vscode [upstream] Handlebars file-extensions="handlebars, hbs, hjs" - 1.98.2@microsoft/vscode [upstream] + 1.104.0@microsoft/vscode [upstream] HLSL (High-Level Shader Language) file-extensions="cginc, compute, fx, fxh, hlsl, hlsli, psh, vsh" - 1.98.2@microsoft/vscode [upstream] + 1.104.0@microsoft/vscode [upstream] HTML file-extensions="asp, aspx, ejs, htm, html, jshtm, jsp, mdoc, rhtml, shtml, volt, xht, xhtml" - 1.98.2@microsoft/vscode [upstream] + 1.104.0@microsoft/vscode [upstream] INI Config File file-extensions="ini" - 1.98.2@microsoft/vscode [upstream] + 1.104.0@microsoft/vscode [upstream] Java file-extensions="jav, java" - 1.98.2@microsoft/vscode [upstream] + 1.104.0@microsoft/vscode [upstream] JavaScript file-extensions="cjs, es6, js, mjs, pac"
file-names="jakefile" - 1.98.2@microsoft/vscode [upstream] + 1.104.0@microsoft/vscode [upstream] JavaScript JSX file-extensions="jsx" - 1.98.2@microsoft/vscode [upstream] + 1.104.0@microsoft/vscode [upstream] JSON file-extensions="bowerrc, css.map, geojson, har, ipynb, js.map, jscsrc, jslintrc, json, jsonld, ts.map, vuerc, webmanifest"
file-names=".watchmanconfig, composer.lock" - 1.98.2@microsoft/vscode [upstream] + 1.104.0@microsoft/vscode [upstream] JSON Lines file-extensions="jsonl, ndjson" - 1.98.2@microsoft/vscode [upstream] + 1.104.0@microsoft/vscode [upstream] JSON with Comments - file-extensions="babelrc, eslintrc, eslintrc.json, hintrc, jsfmtrc, jshintrc, jsonc, swcrc"
file-names=".babelrc.json, .ember-cli, babel.config.json, bun.lock, typedoc.json" - 1.98.2@microsoft/vscode [upstream] + file-extensions="babelrc, eslintrc, eslintrc.json, hintrc, jsfmtrc, jshintrc, jsonc, swcrc, toolset.jsonc"
file-names=".babelrc.json, .ember-cli, babel.config.json, bun.lock, typedoc.json" + 1.104.0@microsoft/vscode [upstream] Julia file-extensions="jl" - 1.98.2@microsoft/vscode [upstream] + 1.104.0@microsoft/vscode [upstream] LaTeX file-extensions="ctx, ltx, tex" - 1.98.2@microsoft/vscode [upstream] + 1.104.0@microsoft/vscode [upstream] Less file-extensions="less" - 1.98.2@microsoft/vscode [upstream] + 1.104.0@microsoft/vscode [upstream] Lua file-extensions="lua" - 1.98.2@microsoft/vscode [upstream] + 1.104.0@microsoft/vscode [upstream] Makefile file-extensions="mak, mk"
file-names="GNUmakefile, Makefile, OCamlMakefile, makefile" - 1.98.2@microsoft/vscode [upstream] + 1.104.0@microsoft/vscode [upstream] Markdown file-extensions="markdn, markdown, md, mdown, mdtext, mdtxt, mdwn, mkd, workbook" - 1.98.2@microsoft/vscode [upstream] + 1.104.0@microsoft/vscode [upstream] MS SQL file-extensions="dsql, sql" - 1.98.2@microsoft/vscode [upstream] + 1.104.0@microsoft/vscode [upstream] Objective-C file-extensions="m" - 1.98.2@microsoft/vscode [upstream] + 1.104.0@microsoft/vscode [upstream] Objective-C++ file-extensions="mm" - 1.98.2@microsoft/vscode [upstream] + 1.104.0@microsoft/vscode [upstream] Perl file-extensions="PL, pl, pm, pod, psgi, t" - 1.98.2@microsoft/vscode [upstream] + 1.104.0@microsoft/vscode [upstream] PHP file-extensions="ctp, php, php4, php5, phtml" - 1.98.2@microsoft/vscode [upstream] + 1.104.0@microsoft/vscode [upstream] PowerShell file-extensions="ps1, psd1, psm1, psrc, pssc" - 1.98.2@microsoft/vscode [upstream] + 1.104.0@microsoft/vscode [upstream] Pug file-extensions="jade, pug" - 1.98.2@microsoft/vscode [upstream] + 1.104.0@microsoft/vscode [upstream] Python file-extensions="cpy, gyp, gypi, ipy, py, pyi, pyt, pyw, rpy"
file-names="SConscript, SConstruct" - 1.98.2@microsoft/vscode [upstream] + 1.104.0@microsoft/vscode [upstream] R file-extensions="r, rhistory, rprofile, rt" - 1.98.2@microsoft/vscode [upstream] + 1.104.0@microsoft/vscode [upstream] Raku (Perl 6) file-extensions="nqp, p6, pl6, pm6, raku, rakudoc, rakumod, rakutest" - 1.98.2@microsoft/vscode [upstream] + 1.104.0@microsoft/vscode [upstream] reStructuredText file-extensions="rst" - 1.98.2@microsoft/vscode [upstream] + 1.104.0@microsoft/vscode [upstream] Ruby file-extensions="erb, gemspec, podspec, rake, rb, rbi, rbx, rjs, ru"
file-names="appfile, appraisals, berksfile, berksfile.lock, brewfile, capfile, cheffile, dangerfile, deliverfile, fastfile, gemfile, guardfile, gymfile, hobofile, matchfile, podfile, puppetfile, rakefile, rantfile, scanfile, snapfile, thorfile, vagrantfile" - 1.98.2@microsoft/vscode [upstream] + 1.104.0@microsoft/vscode [upstream] Rust file-extensions="rs" - 1.98.2@microsoft/vscode [upstream] + 1.104.0@microsoft/vscode [upstream] SCSS file-extensions="scss" - 1.98.2@microsoft/vscode [upstream] + 1.104.0@microsoft/vscode [upstream] ShaderLab file-extensions="shader" - 1.98.2@microsoft/vscode [upstream] + 1.104.0@microsoft/vscode [upstream] Shell Script file-extensions="Xsession, bash, bash_aliases, bash_login, bash_logout, bash_profile, bashrc, csh, cshrc, ebuild, eclass, fish, ksh, profile, sh, tcshrc, xprofile, xsession, xsessionrc, yash_profile, yashrc, zlogin, zlogout, zprofile, zsh, zsh-theme, zshenv, zshrc"
file-names=".envrc, .hushlogin, APKBUILD, PKGBUILD, bashrc_Apple_Terminal, zlogin, zlogout, zprofile, zshenv, zshrc, zshrc_Apple_Terminal"
file-patterns=".env.*" - 1.98.2@microsoft/vscode [upstream] + 1.104.0@microsoft/vscode [upstream] Swift file-extensions="swift" - 1.98.2@microsoft/vscode [upstream] + 1.104.0@microsoft/vscode [upstream] TeX file-extensions="bbx, cbx, cls, sty" - 1.98.2@microsoft/vscode [upstream] + 1.104.0@microsoft/vscode [upstream] TypeScript file-extensions="cts, mts, ts" - 1.98.2@microsoft/vscode [upstream] + 1.104.0@microsoft/vscode [upstream] TypeScript JSX file-extensions="tsx" - 1.98.2@microsoft/vscode [upstream] + 1.104.0@microsoft/vscode [upstream] Visual Basic file-extensions="bas, brs, vb, vba, vbs" - 1.98.2@microsoft/vscode [upstream] + 1.104.0@microsoft/vscode [upstream] VS Code Search Result file-extensions="code-search" - 1.98.2@microsoft/vscode + 1.104.0@microsoft/vscode XML - file-extensions="ascx, atom, axaml, axml, bpmn, cpt, csl, csproj, csproj.user, dita, ditamap, dtd, dtml, ent, fsproj, fxml, iml, isml, jmx, launch, menu, mod, mxml, nuspec, opml, owl, proj, props, pt, publishsettings, pubxml, pubxml.user, rbxlx, rbxmx, rdf, rng, rss, shproj, storyboard, svg, targets, tld, tmx, vbproj, vbproj.user, vcxproj, vcxproj.filters, wsdl, wxi, wxl, wxs, xaml, xbl, xib, xlf, xliff, xml, xoml, xpdl, xsd, xul" - 1.98.2@microsoft/vscode [upstream] + file-extensions="ascx, atom, axaml, axml, bpmn, cpt, csl, csproj, csproj.user, dita, ditamap, dtd, dtml, ent, fsproj, fxml, iml, isml, jmx, launch, menu, mod, mxml, nuspec, opml, owl, proj, props, pt, publishsettings, pubxml, pubxml.user, rbxlx, rbxmx, rdf, rng, rss, shproj, slnx, storyboard, svg, targets, tld, tmx, vbproj, vbproj.user, vcxproj, vcxproj.filters, wsdl, wxi, wxl, wxs, xaml, xbl, xib, xlf, xliff, xml, xoml, xpdl, xsd, xul" + 1.104.0@microsoft/vscode [upstream] XSL file-extensions="xsl, xslt" - 1.98.2@microsoft/vscode [upstream] + 1.104.0@microsoft/vscode [upstream] YAML diff --git a/org.eclipse.tm4e.language_pack/plugin.xml b/org.eclipse.tm4e.language_pack/plugin.xml index b3d7efc0a..176dbdd3a 100644 --- a/org.eclipse.tm4e.language_pack/plugin.xml +++ b/org.eclipse.tm4e.language_pack/plugin.xml @@ -652,7 +652,7 @@ + file-extensions="babelrc,eslintrc,hintrc,jsfmtrc,jshintrc,jsonc,swcrc" file-names=".babelrc.json,.ember-cli,babel.config.json,bun.lock,typedoc.json" file-patterns="*.eslintrc.json,*.toolset.jsonc" /> @@ -692,7 +692,7 @@ + file-extensions="code-snippets" file-patterns="**/User/profiles/*/snippets/*.json,**/User/snippets/*.json,**/snippets*.json" /> @@ -1402,7 +1402,7 @@ + file-extensions="ascx,atom,axaml,axml,bpmn,cpt,csl,csproj,dita,ditamap,dtd,dtml,ent,fsproj,fxml,iml,isml,jmx,launch,menu,mod,mxml,nuspec,opml,owl,proj,props,pt,publishsettings,pubxml,rbxlx,rbxmx,rdf,rng,rss,shproj,slnx,storyboard,svg,targets,tld,tmx,vbproj,vcxproj,wsdl,wxi,wxl,wxs,xaml,xbl,xib,xlf,xliff,xml,xoml,xpdl,xsd,xul" file-patterns="*.csproj.user,*.pubxml.user,*.vbproj.user,*.vcxproj.filters" /> diff --git a/org.eclipse.tm4e.language_pack/syntaxes/csharp/csharp.language-configuration.json b/org.eclipse.tm4e.language_pack/syntaxes/csharp/csharp.language-configuration.json index 60814ae02..b25bc0acf 100644 --- a/org.eclipse.tm4e.language_pack/syntaxes/csharp/csharp.language-configuration.json +++ b/org.eclipse.tm4e.language_pack/syntaxes/csharp/csharp.language-configuration.json @@ -76,6 +76,24 @@ "\"" ] ], + "colorizedBracketPairs": [ + [ + "{", + "}" + ], + [ + "[", + "]" + ], + [ + "(", + ")" + ], + [ + "<", + ">" + ] + ], "folding": { "markers": { "start": "^\\s*#region\\b", @@ -84,9 +102,10 @@ }, "onEnterRules": [ // Add // when pressing enter from inside line comment + // We do not want to match /// (a documentation comment) { "beforeText": { - "pattern": "\/\/.*" + "pattern": "[^\/]\/\/[^\/].*" }, "afterText": { "pattern": "^(?!\\s*$).+" @@ -96,5 +115,16 @@ "appendText": "// " } }, + // Add /// when pressing enter from anywhere inside a documentation comment. + // Documentation comments are not valid after non-whitespace. + { + "beforeText": { + "pattern": "^\\s*\/\/\/" + }, + "action": { + "indent": "none", + "appendText": "/// " + } + }, ] } diff --git a/org.eclipse.tm4e.language_pack/syntaxes/csharp/csharp.tmLanguage.json b/org.eclipse.tm4e.language_pack/syntaxes/csharp/csharp.tmLanguage.json index c4d9a2519..1afcc3053 100644 --- a/org.eclipse.tm4e.language_pack/syntaxes/csharp/csharp.tmLanguage.json +++ b/org.eclipse.tm4e.language_pack/syntaxes/csharp/csharp.tmLanguage.json @@ -4,7 +4,7 @@ "If you want to provide a fix or improvement, please create a pull request against the original repository.", "Once accepted there, we are happy to receive an update request." ], - "version": "https://github.com/dotnet/csharp-tmLanguage/commit/62026a70f9fcc42d9222eccfec34ed5ee0784f3d", + "version": "https://github.com/dotnet/csharp-tmLanguage/commit/1381bedfb087c18aca67af8278050d11bc9d9349", "name": "C#", "scopeName": "source.cs", "patterns": [ @@ -714,11 +714,11 @@ }, "enum-declaration": { "begin": "(?=\\benum\\b)", - "end": "(?<=\\})", + "end": "(?<=\\})|(?=;)", "patterns": [ { "begin": "(?=enum)", - "end": "(?=\\{)", + "end": "(?=\\{)|(?=;)", "patterns": [ { "include": "#comment" @@ -805,7 +805,7 @@ }, "interface-declaration": { "begin": "(?=\\binterface\\b)", - "end": "(?<=\\})", + "end": "(?<=\\})|(?=;)", "patterns": [ { "begin": "(?x)\n(interface)\\b\\s+\n(@?[_[:alpha:]][_[:alnum:]]*)", @@ -817,7 +817,7 @@ "name": "entity.name.type.interface.cs" } }, - "end": "(?=\\{)", + "end": "(?=\\{)|(?=;)", "patterns": [ { "include": "#comment" diff --git a/org.eclipse.tm4e.language_pack/syntaxes/fsharp/fsharp.tmLanguage.json b/org.eclipse.tm4e.language_pack/syntaxes/fsharp/fsharp.tmLanguage.json index 8ba555b77..97f607a6b 100644 --- a/org.eclipse.tm4e.language_pack/syntaxes/fsharp/fsharp.tmLanguage.json +++ b/org.eclipse.tm4e.language_pack/syntaxes/fsharp/fsharp.tmLanguage.json @@ -4,7 +4,7 @@ "If you want to provide a fix or improvement, please create a pull request against the original repository.", "Once accepted there, we are happy to receive an update request." ], - "version": "https://github.com/ionide/ionide-fsgrammar/commit/c62c78404d0b2c14816aae61ac0688663a5990a3", + "version": "https://github.com/ionide/ionide-fsgrammar/commit/be3c51d2c28d3aaacd89ecd067e766bebe387f89", "name": "fsharp", "scopeName": "source.fsharp", "patterns": [ @@ -525,15 +525,6 @@ }, "comments": { "patterns": [ - { - "name": "comment.literate.command.fsharp", - "match": "(\\(\\*{3}.*\\*{3}\\))", - "beginCaptures": { - "1": { - "name": "comment.block.fsharp" - } - } - }, { "name": "comment.block.markdown.fsharp", "begin": "^\\s*(\\(\\*\\*(?!\\)))((?!\\*\\)).)*$", @@ -543,7 +534,7 @@ "name": "comment.block.fsharp" } }, - "endCaptures": { + "whileCaptures": { "1": { "name": "comment.block.fsharp" } @@ -807,13 +798,16 @@ ] }, { - "match": "(:)\\s*([?[:alpha:]0-9'`^._ ]+)", + "match": "(:)\\s*([?[:alpha:]0-9'`^._ ]+)(\\|\\s*(null))?", "captures": { "1": { "name": "keyword.symbol.fsharp" }, "2": { "name": "entity.name.type.fsharp" + }, + "4": { + "name": "entity.name.type.fsharp" } } }, @@ -936,8 +930,8 @@ "patterns": [ { "name": "binding.fsharp", - "begin": "\\b(let mutable|static let mutable|static let|let inline|let|and|member val|member inline|static member inline|static member val|static member|default|member|override|let!)(\\s+rec|mutable)?(\\s+\\[\\<.*\\>\\])?\\s*(private|internal|public)?\\s+(\\[[^-=]*\\]|[_[:alpha:]]([_[:alpha:]0-9\\._]+)*|``[_[:alpha:]]([_[:alpha:]0-9\\._`\\s]+|(?<=,)\\s)*)?", - "end": "\\s*((with\\b)|(=|\\n+=|(?<=\\=)))", + "begin": "\\b(let mutable|static let mutable|static let|let inline|let|and inline|and|member val|member inline|static member inline|static member val|static member|default|member|override|let!)(\\s+rec|mutable)?(\\s+\\[\\<.*\\>\\])?\\s*(private|internal|public)?\\s+(\\[[^-=]*\\]|[_[:alpha:]]([_[:alpha:]0-9\\._]+)*|``[_[:alpha:]]([_[:alpha:]0-9\\._`\\s]+|(?<=,)\\s)*)?", + "end": "\\s*((with inline|with)\\b|(=|\\n+=|(?<=\\=)))", "beginCaptures": { "1": { "name": "keyword.fsharp" @@ -1522,7 +1516,7 @@ "match": "(\\(|\\))" }, { - "match": "(\\?{0,1})([[:alpha:]0-9'`^._]+|``[[:alpha:]0-9'`^:,._ ]+``)\\s*(:{0,1})(\\s*([?[:alpha:]0-9'`<>._ ]+)){0,1}", + "match": "(\\?{0,1})([[:alpha:]0-9'`^._]+|``[[:alpha:]0-9'`^:,._ ]+``)\\s*(:{0,1})(\\s*([?[:alpha:]0-9'`<>._ ]+)){0,1}(\\|\\s*(null))?", "captures": { "1": { "name": "keyword.symbol.fsharp" @@ -1535,6 +1529,9 @@ }, "4": { "name": "entity.name.type.fsharp" + }, + "7": { + "name": "entity.name.type.fsharp" } } }, diff --git a/org.eclipse.tm4e.language_pack/syntaxes/go/go.tmLanguage.json b/org.eclipse.tm4e.language_pack/syntaxes/go/go.tmLanguage.json index db17cad3f..e83763a8e 100644 --- a/org.eclipse.tm4e.language_pack/syntaxes/go/go.tmLanguage.json +++ b/org.eclipse.tm4e.language_pack/syntaxes/go/go.tmLanguage.json @@ -4,7 +4,7 @@ "If you want to provide a fix or improvement, please create a pull request against the original repository.", "Once accepted there, we are happy to receive an update request." ], - "version": "https://github.com/worlpaker/go-syntax/commit/fbdaec061157e98dda185c0ce771ce6a2c793045", + "version": "https://github.com/worlpaker/go-syntax/commit/8c70c078f56d237f72574ce49cc95839c4f8a741", "name": "Go", "scopeName": "source.go", "patterns": [ @@ -34,7 +34,7 @@ "include": "#group-variables" }, { - "include": "#field_hover" + "include": "#hover" } ] }, @@ -115,7 +115,7 @@ "include": "#property_variables" }, { - "include": "#switch_select_case_variables" + "include": "#switch_variables" }, { "include": "#other_variables" @@ -219,7 +219,7 @@ "name": "punctuation.definition.end.bracket.curly.go" }, { - "begin": "(?:([\\w\\.\\*]+)?(\\[))", + "begin": "([\\w\\.\\*]+)?(\\[)", "beginCaptures": { "1": { "patterns": [ @@ -227,7 +227,7 @@ "include": "#type-declarations" }, { - "match": "(?:\\w+)", + "match": "\\w+", "name": "entity.name.type.go" } ] @@ -315,7 +315,7 @@ }, "map_types": { "comment": "map types", - "begin": "(?:(\\bmap\\b)(\\[))", + "begin": "(\\bmap\\b)(\\[)", "beginCaptures": { "1": { "name": "keyword.map.go" @@ -515,7 +515,7 @@ "comment": "Note that the order here is very important!", "patterns": [ { - "match": "((?:\\*|\\&)+)(?:(?!\\d)(?=(?:[\\w\\[\\]])|(?:\\<\\-)))", + "match": "(?\\[(?:[^\\[\\]]|\\g)*\\])?(?=\\())", "captures": { "1": { "name": "entity.name.function.support.go" @@ -1757,7 +1761,8 @@ "include": "#after_control_variables" }, { - "match": "(\\b[\\w\\.]+)(\\[(?:[^\\]]+)?\\])?(?=\\{)(?\\[(?:[^\\[\\]]|\\g)*\\])?(?=\\{)", "captures": { "1": { "patterns": [ @@ -1773,30 +1778,27 @@ "2": { "patterns": [ { - "begin": "\\[", - "beginCaptures": { - "0": { - "name": "punctuation.definition.begin.bracket.square.go" - } - }, - "end": "\\]", - "endCaptures": { - "0": { - "name": "punctuation.definition.end.bracket.square.go" - } - }, - "patterns": [ - { - "include": "#type-declarations" - }, - { - "match": "\\w+", - "name": "entity.name.type.go" - }, - { - "include": "$self" - } - ] + "include": "#type-declarations-without-brackets" + }, + { + "match": "\\[", + "name": "punctuation.definition.begin.bracket.square.go" + }, + { + "match": "\\]", + "name": "punctuation.definition.end.bracket.square.go" + }, + { + "match": "\\{", + "name": "punctuation.definition.begin.bracket.curly.go" + }, + { + "match": "\\}", + "name": "punctuation.definition.end.bracket.curly.go" + }, + { + "match": "\\w+", + "name": "entity.name.type.go" } ] } @@ -1806,7 +1808,7 @@ }, "type_assertion_inline": { "comment": "struct/interface types in-line (type assertion) | switch type keyword", - "match": "(?:(?<=\\.\\()(?:(\\btype\\b)|((?:(?:\\s*(?:[\\*\\[\\]]+)?(?:\\<\\-\\s*)?\\bchan\\b(?:\\s*\\<\\-)?\\s*)+)?[\\w\\.\\[\\]\\*]+))(?=\\)))", + "match": "(?:(?<=\\.\\()(?:(\\btype\\b)|((?:(?:\\s*(?:[\\*\\[\\]]+)?(?:\\<\\-\\s*)?\\bchan\\b(?:\\s*\\<\\-)?\\s*)+)?(?:[\\[\\]\\*]+)?(?:[\\w\\.]+)(?:\\[(?:(?:[\\w\\.\\*\\[\\]\\{\\}]+)(?:(?:\\,\\s*(?:[\\w\\.\\*\\[\\]\\{\\}]+))*))?\\])?))(?=\\)))", "captures": { "1": { "name": "keyword.type.go" @@ -1814,10 +1816,34 @@ "2": { "patterns": [ { - "include": "#type-declarations" + "include": "#type-declarations-without-brackets" + }, + { + "match": "\\(", + "name": "punctuation.definition.begin.bracket.round.go" + }, + { + "match": "\\)", + "name": "punctuation.definition.end.bracket.round.go" + }, + { + "match": "\\[", + "name": "punctuation.definition.begin.bracket.square.go" + }, + { + "match": "\\]", + "name": "punctuation.definition.end.bracket.square.go" }, { - "match": "(?:\\w+)", + "match": "\\{", + "name": "punctuation.definition.begin.bracket.curly.go" + }, + { + "match": "\\}", + "name": "punctuation.definition.end.bracket.curly.go" + }, + { + "match": "\\w+", "name": "entity.name.type.go" } ] @@ -1866,7 +1892,7 @@ "include": "#type-declarations" }, { - "match": "(?:\\w+)", + "match": "\\w+", "name": "entity.name.type.go" } ] @@ -1883,7 +1909,7 @@ "include": "#type-declarations" }, { - "match": "(?:\\w+)", + "match": "\\w+", "name": "variable.other.property.go" } ] @@ -1894,7 +1920,7 @@ "include": "#type-declarations" }, { - "match": "(?:\\w+)", + "match": "\\w+", "name": "entity.name.type.go" } ] @@ -1903,12 +1929,12 @@ }, { "comment": "one line with semicolon(;) without formatting gofmt - single type | property variables and types", - "match": "(?:(?<=\\{)((?:\\s*(?:(?:(?:\\w+\\,\\s*)+)?(?:\\w+\\s+))?(?:(?:(?:\\s*(?:[\\*\\[\\]]+)?(?:\\<\\-\\s*)?\\bchan\\b(?:\\s*\\<\\-)?\\s*)+)?(?:[\\S]+)(?:\\;)?))+)\\s*(?=\\}))", + "match": "(?:(?<=\\{)((?:\\s*(?:(?:(?:\\w+\\,\\s*)+)?(?:\\w+\\s+))?(?:(?:(?:\\s*(?:[\\*\\[\\]]+)?(?:\\<\\-\\s*)?\\bchan\\b(?:\\s*\\<\\-)?\\s*)+)?(?:[^\\s/]+)(?:\\;)?))+)\\s*(?=\\}))", "captures": { "1": { "patterns": [ { - "match": "(?:((?:(?:\\w+\\,\\s*)+)?(?:\\w+\\s+))?((?:(?:\\s*(?:[\\*\\[\\]]+)?(?:\\<\\-\\s*)?\\bchan\\b(?:\\s*\\<\\-)?\\s*)+)?(?:[\\S]+)(?:\\;)?))", + "match": "(?:((?:(?:\\w+\\,\\s*)+)?(?:\\w+\\s+))?((?:(?:\\s*(?:[\\*\\[\\]]+)?(?:\\<\\-\\s*)?\\bchan\\b(?:\\s*\\<\\-)?\\s*)+)?(?:[^\\s/]+)(?:\\;)?))", "captures": { "1": { "patterns": [ @@ -1916,7 +1942,7 @@ "include": "#type-declarations" }, { - "match": "(?:\\w+)", + "match": "\\w+", "name": "variable.other.property.go" } ] @@ -1927,7 +1953,7 @@ "include": "#type-declarations" }, { - "match": "(?:\\w+)", + "match": "\\w+", "name": "entity.name.type.go" } ] @@ -1948,7 +1974,7 @@ "include": "#type-declarations" }, { - "match": "(?:\\w+)", + "match": "\\w+", "name": "entity.name.type.go" } ] @@ -1957,7 +1983,7 @@ }, { "comment": "property variables and types", - "match": "(?:((?:(?:\\w+\\,\\s*)+)?(?:\\w+\\s+))([^\\`\"\\/]+))", + "match": "(\\b\\w+(?:\\s*\\,\\s*\\b\\w+)*)\\s*([^\\`\"\\/]+)", "captures": { "1": { "patterns": [ @@ -1965,7 +1991,7 @@ "include": "#type-declarations" }, { - "match": "(?:\\w+)", + "match": "\\w+", "name": "variable.other.property.go" } ] @@ -1979,7 +2005,7 @@ "include": "#parameter-variable-types" }, { - "match": "(?:\\w+)", + "match": "\\w+", "name": "entity.name.type.go" } ] @@ -1993,7 +2019,7 @@ "patterns": [ { "comment": "struct in struct types", - "begin": "(?:((?:\\w+(?:\\,\\s*\\w+)*)(?:(?:\\s*(?:[\\*\\[\\]]+)?(?:\\<\\-\\s*)?\\bchan\\b(?:\\s*\\<\\-)?\\s*)+)?(?:\\s+)(?:[\\[\\]\\*]+)?)(\\bstruct\\b)(?:\\s*)(\\{))", + "begin": "(?:((?:\\b\\w+(?:\\,\\s*\\b\\w+)*)(?:(?:\\s*(?:[\\*\\[\\]]+)?(?:\\<\\-\\s*)?\\bchan\\b(?:\\s*\\<\\-)?\\s*)+)?(?:\\s*)(?:[\\[\\]\\*]+)?)(\\bstruct\\b)(?:\\s*)(\\{))", "beginCaptures": { "1": { "patterns": [ @@ -2030,7 +2056,7 @@ }, { "comment": "interface in struct types", - "begin": "(?:((?:\\w+(?:\\,\\s*\\w+)*)(?:(?:\\s*(?:[\\*\\[\\]]+)?(?:\\<\\-\\s*)?\\bchan\\b(?:\\s*\\<\\-)?\\s*)+)?(?:\\s+)(?:[\\[\\]\\*]+)?)(\\binterface\\b)(?:\\s*)(\\{))", + "begin": "(?:((?:\\b\\w+(?:\\,\\s*\\b\\w+)*)(?:(?:\\s*(?:[\\*\\[\\]]+)?(?:\\<\\-\\s*)?\\bchan\\b(?:\\s*\\<\\-)?\\s*)+)?(?:\\s*)(?:[\\[\\]\\*]+)?)(\\binterface\\b)(?:\\s*)(\\{))", "beginCaptures": { "1": { "patterns": [ @@ -2067,7 +2093,7 @@ }, { "comment": "function in struct types", - "begin": "(?:((?:\\w+(?:\\,\\s*\\w+)*)(?:(?:\\s*(?:[\\*\\[\\]]+)?(?:\\<\\-\\s*)?\\bchan\\b(?:\\s*\\<\\-)?\\s*)+)?(?:\\s+)(?:[\\[\\]\\*]+)?)(\\bfunc\\b)(?:\\s*)(\\())", + "begin": "(?:((?:\\b\\w+(?:\\,\\s*\\b\\w+)*)(?:(?:\\s*(?:[\\*\\[\\]]+)?(?:\\<\\-\\s*)?\\bchan\\b(?:\\s*\\<\\-)?\\s*)+)?(?:\\s*)(?:[\\[\\]\\*]+)?)(\\bfunc\\b)(?:\\s*)(\\())", "beginCaptures": { "1": { "patterns": [ @@ -2143,7 +2169,7 @@ "include": "#type-declarations-without-brackets" }, { - "begin": "(?:([\\w\\.\\*]+)?(\\[))", + "begin": "([\\w\\.\\*]+)?(\\[)", "beginCaptures": { "1": { "patterns": [ @@ -2151,7 +2177,7 @@ "include": "#type-declarations" }, { - "match": "(?:\\w+)", + "match": "\\w+", "name": "entity.name.type.go" } ] @@ -2376,7 +2402,7 @@ "include": "#parameter-variable-types" }, { - "match": "(?:\\w+)", + "match": "\\w+", "name": "entity.name.type.go" } ], @@ -2389,7 +2415,7 @@ }, "after_control_variables": { "comment": "After control variables, to not highlight as a struct/interface (before formatting with gofmt)", - "match": "(?:(?<=\\brange\\b|\\bswitch\\b|\\;|\\bif\\b|\\bfor\\b|\\<|\\>|\\<\\=|\\>\\=|\\=\\=|\\!\\=|\\w(?:\\+|/|\\-|\\*|\\%)|\\w(?:\\+|/|\\-|\\*|\\%)\\=|\\|\\||\\&\\&)(?:\\s*)((?![\\[\\]]+)[[:alnum:]\\-\\_\\!\\.\\[\\]\\<\\>\\=\\*/\\+\\%\\:]+)(?:\\s*)(?=\\{))", + "match": "(?:(?<=\\brange\\b|\\;|\\bif\\b|\\bfor\\b|\\<|\\>|\\<\\=|\\>\\=|\\=\\=|\\!\\=|\\w(?:\\+|/|\\-|\\*|\\%)|\\w(?:\\+|/|\\-|\\*|\\%)\\=|\\|\\||\\&\\&)(?:\\s*)((?![\\[\\]]+)[[:alnum:]\\-\\_\\!\\.\\[\\]\\<\\>\\=\\*/\\+\\%\\:]+)(?:\\s*)(?=\\{))", "captures": { "1": { "patterns": [ @@ -2405,7 +2431,7 @@ "name": "punctuation.definition.end.bracket.square.go" }, { - "match": "(?:\\w+)", + "match": "\\w+", "name": "variable.other.go" } ] @@ -2439,7 +2465,7 @@ }, { "comment": "new keyword", - "begin": "(?:(\\bnew\\b)(\\())", + "begin": "(\\bnew\\b)(\\()", "beginCaptures": { "1": { "name": "entity.name.function.support.builtin.go" @@ -2468,7 +2494,7 @@ "include": "#generic_types" }, { - "match": "(?:\\w+)", + "match": "\\w+", "name": "entity.name.type.go" }, { @@ -2582,7 +2608,7 @@ "name": "punctuation.definition.begin.bracket.curly.go" } }, - "end": "(?:\\})", + "end": "\\}", "endCaptures": { "0": { "name": "punctuation.definition.end.bracket.curly.go" @@ -2648,6 +2674,103 @@ } ] }, + "switch_variables": { + "comment": "variables after case control keyword in switch/select expression, to not scope them as property variables", + "patterns": [ + { + "comment": "single line", + "match": "(?:(?:^\\s*(\\bcase\\b))(?:\\s+)([\\s\\S]+(?:\\:)\\s*(?:/(?:/|\\*).*)?)$)", + "captures": { + "1": { + "name": "keyword.control.go" + }, + "2": { + "patterns": [ + { + "include": "#type-declarations" + }, + { + "include": "#support_functions" + }, + { + "include": "#variable_assignment" + }, + { + "match": "\\w+", + "name": "variable.other.go" + } + ] + } + } + }, + { + "comment": "multi lines", + "begin": "(?<=\\bswitch\\b)(?:\\s*)((?:[\\w\\.]+(?:\\s*(?:[\\:\\=\\!\\,\\+/\\-\\%\\<\\>\\|\\&]+)\\s*[\\w\\.]+)*\\s*(?:[\\:\\=\\!\\,\\+/\\-\\%\\<\\>\\|\\&]+))?(?:\\s*(?:[\\w\\.\\*\\(\\)\\[\\]\\+/\\-\\%\\<\\>\\|\\&]+)?\\s*(?:\\;\\s*(?:[\\w\\.\\*\\(\\)\\[\\]\\+/\\-\\%\\<\\>\\|\\&]+)\\s*)?))(\\{)", + "beginCaptures": { + "1": { + "patterns": [ + { + "include": "#support_functions" + }, + { + "include": "#type-declarations" + }, + { + "include": "#variable_assignment" + }, + { + "match": "\\w+", + "name": "variable.other.go" + } + ] + }, + "2": { + "name": "punctuation.definition.begin.bracket.curly.go" + } + }, + "end": "\\}", + "endCaptures": { + "0": { + "name": "punctuation.definition.end.bracket.curly.go" + } + }, + "patterns": [ + { + "begin": "\\bcase\\b", + "beginCaptures": { + "0": { + "name": "keyword.control.go" + } + }, + "end": "\\:", + "endCaptures": { + "0": { + "name": "punctuation.other.colon.go" + } + }, + "patterns": [ + { + "include": "#support_functions" + }, + { + "include": "#type-declarations" + }, + { + "include": "#variable_assignment" + }, + { + "match": "\\w+", + "name": "variable.other.go" + } + ] + }, + { + "include": "$self" + } + ] + } + ] + }, "var_assignment": { "comment": "variable assignment with var keyword", "patterns": [ @@ -2958,32 +3081,6 @@ } } }, - "switch_select_case_variables": { - "comment": "variables after case control keyword in switch/select expression, to not scope them as property variables", - "match": "(?:(?:^\\s*(\\bcase\\b))(?:\\s+)([\\s\\S]+(?:\\:)\\s*(?:/(?:/|\\*).*)?)$)", - "captures": { - "1": { - "name": "keyword.control.go" - }, - "2": { - "patterns": [ - { - "include": "#type-declarations" - }, - { - "include": "#support_functions" - }, - { - "include": "#variable_assignment" - }, - { - "match": "\\w+", - "name": "variable.other.go" - } - ] - } - } - }, "slice_index_variables": { "comment": "slice index and capacity variables, to not scope them as property variables", "match": "(?<=\\w\\[)((?:(?:\\b[\\w\\.\\*\\+/\\-\\%\\<\\>\\|\\&]+\\:)|(?:\\:\\b[\\w\\.\\*\\+/\\-\\%\\<\\>\\|\\&]+))(?:\\b[\\w\\.\\*\\+/\\-\\%\\<\\>\\|\\&]+)?(?:\\:\\b[\\w\\.\\*\\+/\\-\\%\\<\\>\\|\\&]+)?)(?=\\])", @@ -3037,7 +3134,7 @@ }, "double_parentheses_types": { "comment": "double parentheses types", - "match": "(?:(?]*)(?]*)(?\\s*)|((.*[^\\w]+|\\s*)(if|while|for)\\s*\\(.*\\)\\s*))$" + "pattern": "^((.*=>\\s*)|((.*[^\\w]+|\\s*)((if|while|for)\\s*\\(.*\\)\\s*|else\\s*)))$" } }, "onEnterRules": [ @@ -230,12 +230,8 @@ }, // Add // when pressing enter from inside line comment { - "beforeText": { - "pattern": "(?\\s*)|((.*[^\\w]+|\\s*)(if|while|for)\\s*\\(.*\\)\\s*))$" + "pattern": "^((.*=>\\s*)|((.*[^\\w]+|\\s*)((if|while|for)\\s*\\(.*\\)\\s*|else\\s*)))$" } }, "onEnterRules": [ @@ -230,12 +230,8 @@ }, // Add // when pressing enter from inside line comment { - "beforeText": { - "pattern": "(??@\\[\\\\\\]^_`|~][a-zA-Z0-9!$&*+\\-./:;<>?@\\[\\\\\\]^_`|~]*)", - "beginCaptures": { - "1": { - "name": "keyword.other.string-constant.bibtex" - }, - "2": { - "name": "punctuation.definition.keyword.bibtex" - }, - "3": { - "name": "punctuation.section.string-constant.begin.bibtex" - }, - "4": { - "name": "variable.other.bibtex" - } - }, - "end": "\\}", - "endCaptures": { - "0": { - "name": "punctuation.section.string-constant.end.bibtex" - } - }, - "name": "meta.string-constant.braces.bibtex", - "patterns": [ - { - "include": "#field_value" - } - ] + "include": "#entry" }, { - "begin": "((@)(?i:string))\\s*(\\()\\s*([a-zA-Z!$&*+\\-./:;<>?@\\[\\\\\\]^_`|~][a-zA-Z0-9!$&*+\\-./:;<>?@\\[\\\\\\]^_`|~]*)", - "beginCaptures": { - "1": { - "name": "keyword.other.string-constant.bibtex" - }, - "2": { - "name": "punctuation.definition.keyword.bibtex" - }, - "3": { - "name": "punctuation.section.string-constant.begin.bibtex" - }, - "4": { - "name": "variable.other.bibtex" - } - }, - "end": "\\)", - "endCaptures": { - "0": { - "name": "punctuation.section.string-constant.end.bibtex" - } - }, - "name": "meta.string-constant.parenthesis.bibtex", + "begin": "[^@\\n]", + "end": "(?=@)", + "name": "comment.block.bibtex" + } + ], + "repository": { + "preamble": { "patterns": [ { - "include": "#field_value" + "begin": "((@)(?i:preamble))\\s*(\\{)\\s*", + "beginCaptures": { + "1": { + "name": "keyword.other.preamble.bibtex" + }, + "2": { + "name": "punctuation.definition.keyword.bibtex" + }, + "3": { + "name": "punctuation.section.preamble.begin.bibtex" + } + }, + "end": "\\}", + "endCaptures": { + "0": { + "name": "punctuation.section.preamble.end.bibtex" + } + }, + "name": "meta.preamble.braces.bibtex", + "patterns": [ + { + "include": "#field_value" + } + ] + }, + { + "begin": "((@)(?i:preamble))\\s*(\\()\\s*", + "beginCaptures": { + "1": { + "name": "keyword.other.preamble.bibtex" + }, + "2": { + "name": "punctuation.definition.keyword.bibtex" + }, + "3": { + "name": "punctuation.section.preamble.begin.bibtex" + } + }, + "end": "\\)", + "endCaptures": { + "0": { + "name": "punctuation.section.preamble.end.bibtex" + } + }, + "name": "meta.preamble.parenthesis.bibtex", + "patterns": [ + { + "include": "#field_value" + } + ] } ] }, - { - "begin": "((@)[a-zA-Z!$&*+\\-./:;<>?@\\[\\\\\\]^_`|~][a-zA-Z0-9!$&*+\\-./:;<>?@\\[\\\\\\]^_`|~]*)\\s*(\\{)\\s*([^\\s,}]*)", - "beginCaptures": { - "1": { - "name": "keyword.other.entry-type.bibtex" - }, - "2": { - "name": "punctuation.definition.keyword.bibtex" - }, - "3": { - "name": "punctuation.section.entry.begin.bibtex" - }, - "4": { - "name": "entity.name.type.entry-key.bibtex" - } - }, - "end": "\\}", - "endCaptures": { - "0": { - "name": "punctuation.section.entry.end.bibtex" - } - }, - "name": "meta.entry.braces.bibtex", + "string": { "patterns": [ { - "begin": "([a-zA-Z!$&*+\\-./:;<>?@\\[\\\\\\]^_`|~][a-zA-Z0-9!$&*+\\-./:;<>?@\\[\\\\\\]^_`|~]*)\\s*(\\=)", + "begin": "((@)(?i:string))\\s*(\\{)\\s*([a-zA-Z!$&*+\\-./:;<>?@\\[\\\\\\]^_`|~][a-zA-Z0-9!$&*+\\-./:;<>?@\\[\\\\\\]^_`|~]*)", + "beginCaptures": { + "1": { + "name": "keyword.other.string-constant.bibtex" + }, + "2": { + "name": "punctuation.definition.keyword.bibtex" + }, + "3": { + "name": "punctuation.section.string-constant.begin.bibtex" + }, + "4": { + "name": "variable.other.bibtex" + } + }, + "end": "\\}", + "endCaptures": { + "0": { + "name": "punctuation.section.string-constant.end.bibtex" + } + }, + "name": "meta.string-constant.braces.bibtex", + "patterns": [ + { + "include": "#field_value" + } + ] + }, + { + "begin": "((@)(?i:string))\\s*(\\()\\s*([a-zA-Z!$&*+\\-./:;<>?@\\[\\\\\\]^_`|~][a-zA-Z0-9!$&*+\\-./:;<>?@\\[\\\\\\]^_`|~]*)", "beginCaptures": { "1": { - "name": "support.function.key.bibtex" + "name": "keyword.other.string-constant.bibtex" }, "2": { - "name": "punctuation.separator.key-value.bibtex" + "name": "punctuation.definition.keyword.bibtex" + }, + "3": { + "name": "punctuation.section.string-constant.begin.bibtex" + }, + "4": { + "name": "variable.other.bibtex" + } + }, + "end": "\\)", + "endCaptures": { + "0": { + "name": "punctuation.section.string-constant.end.bibtex" } }, - "end": "(?=[,}])", - "name": "meta.key-assignment.bibtex", + "name": "meta.string-constant.parenthesis.bibtex", "patterns": [ { "include": "#field_value" @@ -172,57 +152,98 @@ } ] }, - { - "begin": "((@)[a-zA-Z!$&*+\\-./:;<>?@\\[\\\\\\]^_`|~][a-zA-Z0-9!$&*+\\-./:;<>?@\\[\\\\\\]^_`|~]*)\\s*(\\()\\s*([^\\s,]*)", - "beginCaptures": { - "1": { - "name": "keyword.other.entry-type.bibtex" - }, - "2": { - "name": "punctuation.definition.keyword.bibtex" - }, - "3": { - "name": "punctuation.section.entry.begin.bibtex" - }, - "4": { - "name": "entity.name.type.entry-key.bibtex" - } - }, - "end": "\\)", - "endCaptures": { - "0": { - "name": "punctuation.section.entry.end.bibtex" - } - }, - "name": "meta.entry.parenthesis.bibtex", + "entry": { "patterns": [ { - "begin": "([a-zA-Z!$&*+\\-./:;<>?@\\[\\\\\\]^_`|~][a-zA-Z0-9!$&*+\\-./:;<>?@\\[\\\\\\]^_`|~]*)\\s*(\\=)", + "begin": "((@)[a-zA-Z!$&*+\\-./:;<>?@\\[\\\\\\]^_`|~][a-zA-Z0-9!$&*+\\-./:;<>?@\\[\\\\\\]^_`|~]*)\\s*(\\{)\\s*([^\\s,}]*)", "beginCaptures": { "1": { - "name": "support.function.key.bibtex" + "name": "keyword.other.entry-type.bibtex" }, "2": { - "name": "punctuation.separator.key-value.bibtex" + "name": "punctuation.definition.keyword.bibtex" + }, + "3": { + "name": "punctuation.section.entry.begin.bibtex" + }, + "4": { + "name": "entity.name.type.entry-key.bibtex" } }, - "end": "(?=[,)])", - "name": "meta.key-assignment.bibtex", + "end": "\\}", + "endCaptures": { + "0": { + "name": "punctuation.section.entry.end.bibtex" + } + }, + "name": "meta.entry.braces.bibtex", "patterns": [ { - "include": "#field_value" + "begin": "([a-zA-Z!$&*+\\-./:;<>?@\\[\\\\\\]^_`|~][a-zA-Z0-9!$&*+\\-./:;<>?@\\[\\\\\\]^_`|~]*)\\s*(\\=)", + "beginCaptures": { + "1": { + "name": "support.function.key.bibtex" + }, + "2": { + "name": "punctuation.separator.key-value.bibtex" + } + }, + "end": "(?=[,}])", + "name": "meta.key-assignment.bibtex", + "patterns": [ + { + "include": "#field_value" + } + ] + } + ] + }, + { + "begin": "((@)[a-zA-Z!$&*+\\-./:;<>?@\\[\\\\\\]^_`|~][a-zA-Z0-9!$&*+\\-./:;<>?@\\[\\\\\\]^_`|~]*)\\s*(\\()\\s*([^\\s,]*)", + "beginCaptures": { + "1": { + "name": "keyword.other.entry-type.bibtex" + }, + "2": { + "name": "punctuation.definition.keyword.bibtex" + }, + "3": { + "name": "punctuation.section.entry.begin.bibtex" + }, + "4": { + "name": "entity.name.type.entry-key.bibtex" + } + }, + "end": "\\)", + "endCaptures": { + "0": { + "name": "punctuation.section.entry.end.bibtex" + } + }, + "name": "meta.entry.parenthesis.bibtex", + "patterns": [ + { + "begin": "([a-zA-Z!$&*+\\-./:;<>?@\\[\\\\\\]^_`|~][a-zA-Z0-9!$&*+\\-./:;<>?@\\[\\\\\\]^_`|~]*)\\s*(\\=)", + "beginCaptures": { + "1": { + "name": "support.function.key.bibtex" + }, + "2": { + "name": "punctuation.separator.key-value.bibtex" + } + }, + "end": "(?=[,)])", + "name": "meta.key-assignment.bibtex", + "patterns": [ + { + "include": "#field_value" + } + ] } ] } ] }, - { - "begin": "[^@\\n]", - "end": "(?=@)", - "name": "comment.block.bibtex" - } - ], - "repository": { "field_value": { "patterns": [ { diff --git a/org.eclipse.tm4e.language_pack/syntaxes/latex/latex.tmLanguage.json b/org.eclipse.tm4e.language_pack/syntaxes/latex/latex.tmLanguage.json index d7201e8c6..42780b650 100644 --- a/org.eclipse.tm4e.language_pack/syntaxes/latex/latex.tmLanguage.json +++ b/org.eclipse.tm4e.language_pack/syntaxes/latex/latex.tmLanguage.json @@ -4,7 +4,7 @@ "If you want to provide a fix or improvement, please create a pull request against the original repository.", "Once accepted there, we are happy to receive an update request." ], - "version": "https://github.com/jlelong/vscode-latex-basics/commit/7a35f5e0f19b28f5f1366579e2a9ad34df4f40c9", + "version": "https://github.com/jlelong/vscode-latex-basics/commit/e5d3d4b46731ed37119a5296c12eee7669284eeb", "name": "LaTeX", "scopeName": "text.tex.latex", "patterns": [ @@ -121,7 +121,7 @@ ] }, { - "begin": "((?:\\s*)\\\\begin\\{songs\\}\\{.*\\})", + "begin": "(\\s*\\\\begin\\{songs\\}\\{.*\\})", "captures": { "1": { "patterns": [ @@ -136,21 +136,45 @@ "name": "meta.function.environment.songs.latex", "patterns": [ { - "begin": "\\\\\\[", - "end": "\\]", - "name": "meta.chord.block.latex support.class.chord.block.environment.latex", - "patterns": [ - { - "include": "$self" - } - ] + "include": "text.tex.latex#songs-chords" + } + ] + }, + { + "comment": "This scope applies songs-environment coloring between \\\\beginsong and \\\\endsong. Useful in separate files without \\\\begin{songs}.", + "begin": "\\s*((\\\\)beginsong)(?=\\{)", + "captures": { + "1": { + "name": "support.function.be.latex" + }, + "2": { + "name": "punctuation.definition.function.latex" + }, + "3": { + "name": "punctuation.definition.arguments.begin.latex" + }, + "4": { + "name": "punctuation.definition.arguments.end.latex" + } + }, + "end": "((\\\\)endsong)(?:\\s*\\n)?", + "name": "meta.function.environment.song.latex", + "patterns": [ + { + "include": "#multiline-arg-no-highlight" }, { - "match": "\\^", - "name": "meta.chord.block.latex support.class.chord.block.environment.latex" + "include": "#multiline-optional-arg-no-highlight" }, { - "include": "$self" + "begin": "(?:\\G|(?<=\\]|\\}))\\s*", + "end": "\\s*(?=\\\\endsong)", + "contentName": "meta.data.environment.song.latex", + "patterns": [ + { + "include": "text.tex.latex#songs-chords" + } + ] } ] }, @@ -1932,212 +1956,915 @@ ] }, { - "begin": "((\\\\)addplot)(?:\\+?)((?:\\[[^\\[]*\\]))*\\s*(gnuplot)\\s*((?:\\[[^\\[]*\\]))*\\s*(\\{)", - "captures": { + "begin": "((\\\\)cacheMeCode)(?=\\[(?i:asy|asymptote)\\b|\\{)", + "end": "(?<=\\})", + "beginCaptures": { "1": { - "name": "support.function.be.latex" + "name": "support.function.verb.latex" }, "2": { "name": "punctuation.definition.function.latex" - }, - "3": { - "patterns": [ - { - "include": "#optional-arg-bracket" - } - ] - }, - "4": { - "name": "variable.parameter.function.latex" - }, - "5": { - "patterns": [ - { - "include": "#optional-arg-bracket" - } - ] - }, - "6": { - "name": "punctuation.definition.arguments.begin.latex" } }, - "end": "\\s*(\\};)", "patterns": [ { - "begin": "%", + "include": "text.tex.latex#multiline-optional-arg-no-highlight" + }, + { + "begin": "(?<=\\])(\\{)", + "end": "\\}", "beginCaptures": { "0": { - "name": "punctuation.definition.comment.latex" + "name": "punctuation.definition.arguments.begin.latex" } }, - "end": "$\\n?", - "name": "comment.line.percentage.latex" - }, - { - "include": "source.gnuplot" - } - ] - }, - { - "begin": "(\\s*\\\\begin\\{((?:fboxv|boxedv|V|v|spv)erbatim\\*?)\\})", - "captures": { - "1": { + "endCaptures": { + "0": { + "name": "punctuation.definition.arguments.end.latex" + } + }, + "contentName": "source.asy", "patterns": [ { - "include": "#begin-env-tokenizer" + "include": "source.asy" } ] } - }, - "contentName": "markup.raw.verbatim.latex", - "end": "(\\\\end\\{\\2\\})", - "name": "meta.function.verbatim.latex" + ] }, { - "begin": "(\\s*\\\\begin\\{VerbatimOut\\}\\{[^\\}]*\\})", - "captures": { + "begin": "((\\\\)cacheMeCode)(?=\\[(?i:bash)\\b|\\{)", + "end": "(?<=\\})", + "beginCaptures": { "1": { + "name": "support.function.verb.latex" + }, + "2": { + "name": "punctuation.definition.function.latex" + } + }, + "patterns": [ + { + "include": "text.tex.latex#multiline-optional-arg-no-highlight" + }, + { + "begin": "(?<=\\])(\\{)", + "end": "\\}", + "beginCaptures": { + "0": { + "name": "punctuation.definition.arguments.begin.latex" + } + }, + "endCaptures": { + "0": { + "name": "punctuation.definition.arguments.end.latex" + } + }, + "contentName": "source.shell", "patterns": [ { - "include": "#begin-env-tokenizer" + "include": "source.shell" } ] } - }, - "contentName": "markup.raw.verbatim.latex", - "end": "(\\\\end\\{\\VerbatimOut\\})", - "name": "meta.function.verbatim.latex" + ] }, { - "begin": "(\\s*\\\\begin\\{alltt\\})", - "captures": { + "begin": "((\\\\)cacheMeCode)(?=\\[(?i:c|cpp)\\b|\\{)", + "end": "(?<=\\})", + "beginCaptures": { "1": { - "patterns": [ - { - "include": "#begin-env-tokenizer" - } - ] + "name": "support.function.verb.latex" + }, + "2": { + "name": "punctuation.definition.function.latex" } }, - "contentName": "markup.raw.verbatim.latex", - "end": "(\\\\end\\{alltt\\})", - "name": "meta.function.alltt.latex", "patterns": [ { - "captures": { - "1": { - "name": "punctuation.definition.function.latex" + "include": "text.tex.latex#multiline-optional-arg-no-highlight" + }, + { + "begin": "(?<=\\])(\\{)", + "end": "\\}", + "beginCaptures": { + "0": { + "name": "punctuation.definition.arguments.begin.latex" } }, - "match": "(\\\\)[A-Za-z]+", - "name": "support.function.general.latex" - } - ] - }, - { - "begin": "(\\s*\\\\begin\\{([Cc]omment)\\})", - "captures": { - "1": { + "endCaptures": { + "0": { + "name": "punctuation.definition.arguments.end.latex" + } + }, + "contentName": "source.cpp.embedded.latex", "patterns": [ { - "include": "#begin-env-tokenizer" + "include": "source.cpp.embedded.latex" } ] } - }, - "contentName": "comment.line.percentage.latex", - "end": "(\\\\end\\{\\2\\})", - "name": "meta.function.verbatim.latex" + ] }, { - "begin": "(?:\\s*)((\\\\)(?:href|hyperref|hyperimage))(?=\\[|\\{)", + "begin": "((\\\\)cacheMeCode)(?=\\[(?i:css)\\b|\\{)", + "end": "(?<=\\})", "beginCaptures": { "1": { - "name": "support.function.url.latex" - } - }, - "comment": "Captures \\command[option]{url}{optional category}{optional name}{text}", - "end": "(\\})", - "endCaptures": { - "1": { - "name": "punctuation.definition.arguments.end.latex" + "name": "support.function.verb.latex" + }, + "2": { + "name": "punctuation.definition.function.latex" } }, - "name": "meta.function.hyperlink.latex", "patterns": [ { - "include": "#multiline-optional-arg-no-highlight" + "include": "text.tex.latex#multiline-optional-arg-no-highlight" }, { - "begin": "(?:\\G|(?<=\\]))(\\{)([^}]*)(\\})(?:\\{[^}]*\\}){2}?(\\{)", + "begin": "(?<=\\])(\\{)", + "end": "\\}", "beginCaptures": { - "1": { + "0": { "name": "punctuation.definition.arguments.begin.latex" - }, - "2": { - "name": "markup.underline.link.latex" - }, - "3": { + } + }, + "endCaptures": { + "0": { "name": "punctuation.definition.arguments.end.latex" - }, - "4": { - "name": "punctuation.definition.arguments.begin.latex" } }, - "contentName": "meta.variable.parameter.function.latex", - "end": "(?=\\})", + "contentName": "source.css", "patterns": [ { - "include": "$self" + "include": "source.css" } ] + } + ] + }, + { + "begin": "((\\\\)cacheMeCode)(?=\\[(?i:gnuplot)\\b|\\{)", + "end": "(?<=\\})", + "beginCaptures": { + "1": { + "name": "support.function.verb.latex" + }, + "2": { + "name": "punctuation.definition.function.latex" + } + }, + "patterns": [ + { + "include": "text.tex.latex#multiline-optional-arg-no-highlight" }, { - "begin": "(?:\\G|(?<=\\]))(?:(\\{)[^}]*(\\}))?(\\{)", + "begin": "(?<=\\])(\\{)", + "end": "\\}", "beginCaptures": { - "1": { + "0": { "name": "punctuation.definition.arguments.begin.latex" - }, - "2": { + } + }, + "endCaptures": { + "0": { "name": "punctuation.definition.arguments.end.latex" - }, - "3": { - "name": "punctuation.definition.arguments.begin.latex" } }, - "contentName": "meta.variable.parameter.function.latex", - "end": "(?=\\})", + "contentName": "source.gnuplot", "patterns": [ { - "include": "$self" + "include": "source.gnuplot" } ] } ] }, { - "captures": { + "begin": "((\\\\)cacheMeCode)(?=\\[(?i:hs|haskell)\\b|\\{)", + "end": "(?<=\\})", + "beginCaptures": { "1": { - "name": "support.function.url.latex" + "name": "support.function.verb.latex" }, "2": { "name": "punctuation.definition.function.latex" - }, - "3": { - "name": "punctuation.definition.arguments.begin.latex" - }, - "5": { - "name": "punctuation.definition.arguments.end.latex" - }, - "'": { - "name": "markup.underline.link.latex" } }, - "match": "(?:\\s*)((\\\\)url)(\\{)([^}]*)(\\})", - "name": "meta.function.link.url.latex" - }, - { - "captures": { + "patterns": [ + { + "include": "text.tex.latex#multiline-optional-arg-no-highlight" + }, + { + "begin": "(?<=\\])(\\{)", + "end": "\\}", + "beginCaptures": { + "0": { + "name": "punctuation.definition.arguments.begin.latex" + } + }, + "endCaptures": { + "0": { + "name": "punctuation.definition.arguments.end.latex" + } + }, + "contentName": "source.haskell", + "patterns": [ + { + "include": "source.haskell" + } + ] + } + ] + }, + { + "begin": "((\\\\)cacheMeCode)(?=\\[(?i:html)\\b|\\{)", + "end": "(?<=\\})", + "beginCaptures": { + "1": { + "name": "support.function.verb.latex" + }, + "2": { + "name": "punctuation.definition.function.latex" + } + }, + "patterns": [ + { + "include": "text.tex.latex#multiline-optional-arg-no-highlight" + }, + { + "begin": "(?<=\\])(\\{)", + "end": "\\}", + "beginCaptures": { + "0": { + "name": "punctuation.definition.arguments.begin.latex" + } + }, + "endCaptures": { + "0": { + "name": "punctuation.definition.arguments.end.latex" + } + }, + "contentName": "text.html", + "patterns": [ + { + "include": "text.html.basic" + } + ] + } + ] + }, + { + "begin": "((\\\\)cacheMeCode)(?=\\[(?i:java)\\b|\\{)", + "end": "(?<=\\})", + "beginCaptures": { + "1": { + "name": "support.function.verb.latex" + }, + "2": { + "name": "punctuation.definition.function.latex" + } + }, + "patterns": [ + { + "include": "text.tex.latex#multiline-optional-arg-no-highlight" + }, + { + "begin": "(?<=\\])(\\{)", + "end": "\\}", + "beginCaptures": { + "0": { + "name": "punctuation.definition.arguments.begin.latex" + } + }, + "endCaptures": { + "0": { + "name": "punctuation.definition.arguments.end.latex" + } + }, + "contentName": "source.java", + "patterns": [ + { + "include": "source.java" + } + ] + } + ] + }, + { + "begin": "((\\\\)cacheMeCode)(?=\\[(?i:jl|julia)\\b|\\{)", + "end": "(?<=\\})", + "beginCaptures": { + "1": { + "name": "support.function.verb.latex" + }, + "2": { + "name": "punctuation.definition.function.latex" + } + }, + "patterns": [ + { + "include": "text.tex.latex#multiline-optional-arg-no-highlight" + }, + { + "begin": "(?<=\\])(\\{)", + "end": "\\}", + "beginCaptures": { + "0": { + "name": "punctuation.definition.arguments.begin.latex" + } + }, + "endCaptures": { + "0": { + "name": "punctuation.definition.arguments.end.latex" + } + }, + "contentName": "source.julia", + "patterns": [ + { + "include": "source.julia" + } + ] + } + ] + }, + { + "begin": "((\\\\)cacheMeCode)(?=\\[(?i:js|javascript)\\b|\\{)", + "end": "(?<=\\})", + "beginCaptures": { + "1": { + "name": "support.function.verb.latex" + }, + "2": { + "name": "punctuation.definition.function.latex" + } + }, + "patterns": [ + { + "include": "text.tex.latex#multiline-optional-arg-no-highlight" + }, + { + "begin": "(?<=\\])(\\{)", + "end": "\\}", + "beginCaptures": { + "0": { + "name": "punctuation.definition.arguments.begin.latex" + } + }, + "endCaptures": { + "0": { + "name": "punctuation.definition.arguments.end.latex" + } + }, + "contentName": "source.js", + "patterns": [ + { + "include": "source.js" + } + ] + } + ] + }, + { + "begin": "((\\\\)cacheMeCode)(?=\\[(?i:lua)\\b|\\{)", + "end": "(?<=\\})", + "beginCaptures": { + "1": { + "name": "support.function.verb.latex" + }, + "2": { + "name": "punctuation.definition.function.latex" + } + }, + "patterns": [ + { + "include": "text.tex.latex#multiline-optional-arg-no-highlight" + }, + { + "begin": "(?<=\\])(\\{)", + "end": "\\}", + "beginCaptures": { + "0": { + "name": "punctuation.definition.arguments.begin.latex" + } + }, + "endCaptures": { + "0": { + "name": "punctuation.definition.arguments.end.latex" + } + }, + "contentName": "source.lua", + "patterns": [ + { + "include": "source.lua" + } + ] + } + ] + }, + { + "begin": "((\\\\)cacheMeCode)(?=\\[(?i:py|python|sage)\\b|\\{)", + "end": "(?<=\\})", + "beginCaptures": { + "1": { + "name": "support.function.verb.latex" + }, + "2": { + "name": "punctuation.definition.function.latex" + } + }, + "patterns": [ + { + "include": "text.tex.latex#multiline-optional-arg-no-highlight" + }, + { + "begin": "(?<=\\])(\\{)", + "end": "\\}", + "beginCaptures": { + "0": { + "name": "punctuation.definition.arguments.begin.latex" + } + }, + "endCaptures": { + "0": { + "name": "punctuation.definition.arguments.end.latex" + } + }, + "contentName": "source.python", + "patterns": [ + { + "include": "source.python" + } + ] + } + ] + }, + { + "begin": "((\\\\)cacheMeCode)(?=\\[(?i:rb|ruby)\\b|\\{)", + "end": "(?<=\\})", + "beginCaptures": { + "1": { + "name": "support.function.verb.latex" + }, + "2": { + "name": "punctuation.definition.function.latex" + } + }, + "patterns": [ + { + "include": "text.tex.latex#multiline-optional-arg-no-highlight" + }, + { + "begin": "(?<=\\])(\\{)", + "end": "\\}", + "beginCaptures": { + "0": { + "name": "punctuation.definition.arguments.begin.latex" + } + }, + "endCaptures": { + "0": { + "name": "punctuation.definition.arguments.end.latex" + } + }, + "contentName": "source.ruby", + "patterns": [ + { + "include": "source.ruby" + } + ] + } + ] + }, + { + "begin": "((\\\\)cacheMeCode)(?=\\[(?i:rust)\\b|\\{)", + "end": "(?<=\\})", + "beginCaptures": { + "1": { + "name": "support.function.verb.latex" + }, + "2": { + "name": "punctuation.definition.function.latex" + } + }, + "patterns": [ + { + "include": "text.tex.latex#multiline-optional-arg-no-highlight" + }, + { + "begin": "(?<=\\])(\\{)", + "end": "\\}", + "beginCaptures": { + "0": { + "name": "punctuation.definition.arguments.begin.latex" + } + }, + "endCaptures": { + "0": { + "name": "punctuation.definition.arguments.end.latex" + } + }, + "contentName": "source.rust", + "patterns": [ + { + "include": "source.rust" + } + ] + } + ] + }, + { + "begin": "((\\\\)cacheMeCode)(?=\\[(?i:ts|typescript)\\b|\\{)", + "end": "(?<=\\})", + "beginCaptures": { + "1": { + "name": "support.function.verb.latex" + }, + "2": { + "name": "punctuation.definition.function.latex" + } + }, + "patterns": [ + { + "include": "text.tex.latex#multiline-optional-arg-no-highlight" + }, + { + "begin": "(?<=\\])(\\{)", + "end": "\\}", + "beginCaptures": { + "0": { + "name": "punctuation.definition.arguments.begin.latex" + } + }, + "endCaptures": { + "0": { + "name": "punctuation.definition.arguments.end.latex" + } + }, + "contentName": "source.ts", + "patterns": [ + { + "include": "source.ts" + } + ] + } + ] + }, + { + "begin": "((\\\\)cacheMeCode)(?=\\[(?i:xml)\\b|\\{)", + "end": "(?<=\\})", + "beginCaptures": { + "1": { + "name": "support.function.verb.latex" + }, + "2": { + "name": "punctuation.definition.function.latex" + } + }, + "patterns": [ + { + "include": "text.tex.latex#multiline-optional-arg-no-highlight" + }, + { + "begin": "(?<=\\])(\\{)", + "end": "\\}", + "beginCaptures": { + "0": { + "name": "punctuation.definition.arguments.begin.latex" + } + }, + "endCaptures": { + "0": { + "name": "punctuation.definition.arguments.end.latex" + } + }, + "contentName": "text.xml", + "patterns": [ + { + "include": "text.xml" + } + ] + } + ] + }, + { + "begin": "((\\\\)cacheMeCode)(?=\\[(?i:yaml)\\b|\\{)", + "end": "(?<=\\})", + "beginCaptures": { + "1": { + "name": "support.function.verb.latex" + }, + "2": { + "name": "punctuation.definition.function.latex" + } + }, + "patterns": [ + { + "include": "text.tex.latex#multiline-optional-arg-no-highlight" + }, + { + "begin": "(?<=\\])(\\{)", + "end": "\\}", + "beginCaptures": { + "0": { + "name": "punctuation.definition.arguments.begin.latex" + } + }, + "endCaptures": { + "0": { + "name": "punctuation.definition.arguments.end.latex" + } + }, + "contentName": "source.yaml", + "patterns": [ + { + "include": "source.yaml" + } + ] + } + ] + }, + { + "begin": "((\\\\)cacheMeCode)(?=\\[(?i:tikz|tikzpicture)\\b|\\{)", + "end": "(?<=\\})", + "beginCaptures": { + "1": { + "name": "support.function.verb.latex" + }, + "2": { + "name": "punctuation.definition.function.latex" + } + }, + "patterns": [ + { + "include": "text.tex.latex#multiline-optional-arg-no-highlight" + }, + { + "begin": "(?<=\\])(\\{)", + "end": "\\}", + "beginCaptures": { + "0": { + "name": "punctuation.definition.arguments.begin.latex" + } + }, + "endCaptures": { + "0": { + "name": "punctuation.definition.arguments.end.latex" + } + }, + "contentName": "text.tex.latex", + "patterns": [ + { + "include": "text.tex.latex" + } + ] + } + ] + }, + { + "begin": "((\\\\)cacheMeCode)(?=\\[|\\{)", + "end": "(?<=\\})", + "beginCaptures": { + "1": { + "name": "support.function.verb.latex" + }, + "2": { + "name": "punctuation.definition.function.latex" + } + }, + "patterns": [ + { + "include": "text.tex.latex#multiline-optional-arg-no-highlight" + }, + { + "begin": "(?<=\\])(\\{)", + "end": "\\}", + "beginCaptures": { + "0": { + "name": "punctuation.definition.arguments.begin.latex" + } + }, + "endCaptures": { + "0": { + "name": "punctuation.definition.arguments.end.latex" + } + }, + "contentName": "meta.embedded.block.generic.latex", + "patterns": [ + { + "include": "text.tex#braces" + } + ] + } + ] + }, + { + "begin": "((\\\\)addplot)(?:\\+?)((?:\\[[^\\[]*\\]))*\\s*(gnuplot)\\s*((?:\\[[^\\[]*\\]))*\\s*(\\{)", + "captures": { + "1": { + "name": "support.function.be.latex" + }, + "2": { + "name": "punctuation.definition.function.latex" + }, + "3": { + "patterns": [ + { + "include": "#optional-arg-bracket" + } + ] + }, + "4": { + "name": "variable.parameter.function.latex" + }, + "5": { + "patterns": [ + { + "include": "#optional-arg-bracket" + } + ] + }, + "6": { + "name": "punctuation.definition.arguments.begin.latex" + } + }, + "end": "\\s*(\\};)", + "patterns": [ + { + "begin": "%", + "beginCaptures": { + "0": { + "name": "punctuation.definition.comment.latex" + } + }, + "end": "$\\n?", + "name": "comment.line.percentage.latex" + }, + { + "include": "source.gnuplot" + } + ] + }, + { + "begin": "(\\s*\\\\begin\\{((?:fboxv|boxedv|V|v|spv)erbatim\\*?)\\})", + "captures": { + "1": { + "patterns": [ + { + "include": "#begin-env-tokenizer" + } + ] + } + }, + "contentName": "markup.raw.verbatim.latex", + "end": "(\\\\end\\{\\2\\})", + "name": "meta.function.verbatim.latex" + }, + { + "begin": "(\\s*\\\\begin\\{VerbatimOut\\}\\{[^\\}]*\\})", + "captures": { + "1": { + "patterns": [ + { + "include": "#begin-env-tokenizer" + } + ] + } + }, + "contentName": "markup.raw.verbatim.latex", + "end": "(\\\\end\\{\\VerbatimOut\\})", + "name": "meta.function.verbatim.latex" + }, + { + "begin": "(\\s*\\\\begin\\{alltt\\})", + "captures": { + "1": { + "patterns": [ + { + "include": "#begin-env-tokenizer" + } + ] + } + }, + "contentName": "markup.raw.verbatim.latex", + "end": "(\\\\end\\{alltt\\})", + "name": "meta.function.alltt.latex", + "patterns": [ + { + "captures": { + "1": { + "name": "punctuation.definition.function.latex" + } + }, + "match": "(\\\\)[A-Za-z]+", + "name": "support.function.general.latex" + } + ] + }, + { + "begin": "(\\s*\\\\begin\\{([Cc]omment)\\})", + "captures": { + "1": { + "patterns": [ + { + "include": "#begin-env-tokenizer" + } + ] + } + }, + "contentName": "comment.line.percentage.latex", + "end": "(\\\\end\\{\\2\\})", + "name": "meta.function.verbatim.latex" + }, + { + "begin": "(?:\\s*)((\\\\)(?:href|hyperref|hyperimage))(?=\\[|\\{)", + "beginCaptures": { + "1": { + "name": "support.function.url.latex" + } + }, + "comment": "Captures \\command[option]{url}{optional category}{optional name}{text}", + "end": "(\\})", + "endCaptures": { + "1": { + "name": "punctuation.definition.arguments.end.latex" + } + }, + "name": "meta.function.hyperlink.latex", + "patterns": [ + { + "include": "#multiline-optional-arg-no-highlight" + }, + { + "begin": "(?:\\G|(?<=\\]))(\\{)([^}]*)(\\})(?:\\{[^}]*\\}){2}?(\\{)", + "beginCaptures": { + "1": { + "name": "punctuation.definition.arguments.begin.latex" + }, + "2": { + "name": "markup.underline.link.latex" + }, + "3": { + "name": "punctuation.definition.arguments.end.latex" + }, + "4": { + "name": "punctuation.definition.arguments.begin.latex" + } + }, + "contentName": "meta.variable.parameter.function.latex", + "end": "(?=\\})", + "patterns": [ + { + "include": "$self" + } + ] + }, + { + "begin": "(?:\\G|(?<=\\]))(?:(\\{)[^}]*(\\}))?(\\{)", + "beginCaptures": { + "1": { + "name": "punctuation.definition.arguments.begin.latex" + }, + "2": { + "name": "punctuation.definition.arguments.end.latex" + }, + "3": { + "name": "punctuation.definition.arguments.begin.latex" + } + }, + "contentName": "meta.variable.parameter.function.latex", + "end": "(?=\\})", + "patterns": [ + { + "include": "$self" + } + ] + } + ] + }, + { + "captures": { + "1": { + "name": "support.function.url.latex" + }, + "2": { + "name": "punctuation.definition.function.latex" + }, + "3": { + "name": "punctuation.definition.arguments.begin.latex" + }, + "4": { + "name": "markup.underline.link.latex" + }, + "5": { + "name": "punctuation.definition.arguments.end.latex" + } + }, + "match": "(?:\\s*)((\\\\)(?:url|path))(\\{)([^}]*)(\\})", + "name": "meta.function.link.url.latex" + }, + { + "captures": { "1": { "patterns": [ { @@ -2164,7 +2891,7 @@ "name": "meta.function.end-document.latex" }, { - "begin": "(?:\\s*)((\\\\)begin)(\\{)((?:\\+?array|equation|(?:IEEE)?eqnarray|multline|align|aligned|alignat|alignedat|flalign|flaligned|flalignat|split|gather|gathered|\\+?cases|(?:display)?math|\\+?[a-zA-Z]*matrix|[pbBvV]?NiceMatrix|[pbBvV]?NiceArray|(?:(?:arg)?(?:mini|maxi)))(?:\\*|!)?)(\\})(\\s*\\n)?", + "begin": "(?:\\s*)((\\\\)begin)(\\{)((?:\\+?array|equation|(?:IEEE|sub)?eqnarray|multline|align|aligned|alignat|alignedat|flalign|flaligned|flalignat|split|gather|gathered|\\+?cases|(?:display)?math|\\+?[a-zA-Z]*matrix|[pbBvV]?NiceMatrix|[pbBvV]?NiceArray|(?:(?:arg)?(?:mini|maxi)))(?:\\*|!)?)(\\})(\\s*\\n)?", "captures": { "1": { "name": "support.function.be.latex" @@ -2198,7 +2925,7 @@ "include": "#definition-label" }, { - "include": "text.tex#math" + "include": "text.tex#math-content" }, { "include": "$self" @@ -2232,7 +2959,7 @@ "include": "#definition-label" }, { - "include": "text.tex#math" + "include": "text.tex#math-content" }, { "include": "$self" @@ -2358,7 +3085,7 @@ ] }, { - "begin": "(\\s*\\\\begin\\{(\\w+\\*?)\\})", + "begin": "(\\s*\\\\begin\\{(\\p{Alphabetic}+\\*?)\\})", "captures": { "1": { "patterns": [ @@ -2712,11 +3439,40 @@ "name": "meta.reference.label.latex", "patterns": [ { - "match": "[\\p{Alphabetic}\\p{Number}\\.,:/*!^_-]", + "match": "[\\p{Alphabetic}\\p{Number}\\.,:/*!^_-]+", "name": "constant.other.reference.label.latex" } ] }, + { + "match": "((\\\\)(?:\\w*[rR]efrange\\*?))(?:\\[[^\\]]*\\])?(\\{)([\\p{Alphabetic}\\p{Number}\\.,:/*!^_-]+)(\\})(\\{)([\\p{Alphabetic}\\p{Number}\\.,:/*!^_-]+)(\\})", + "captures": { + "1": { + "name": "keyword.control.ref.latex" + }, + "2": { + "name": "punctuation.definition.keyword.latex" + }, + "3": { + "name": "punctuation.definition.arguments.begin.latex" + }, + "4": { + "name": "constant.other.reference.label.latex" + }, + "5": { + "name": "punctuation.definition.arguments.end.latex" + }, + "6": { + "name": "punctuation.definition.arguments.begin.latex" + }, + "7": { + "name": "constant.other.reference.label.latex" + }, + "8": { + "name": "punctuation.definition.arguments.end.latex" + } + } + }, { "include": "#definition-label" }, @@ -2949,7 +3705,7 @@ "name": "meta.function.verb.latex" }, { - "begin": "((\\\\)(?:directlua|luadirect))(\\{)", + "begin": "((\\\\)(?:directlua|luadirect|luaexec))(\\{)", "beginCaptures": { "1": { "name": "support.function.verb.latex" @@ -2994,7 +3750,7 @@ "name": "meta.math.block.latex support.class.math.block.environment.latex", "patterns": [ { - "include": "text.tex#math" + "include": "text.tex#math-content" }, { "include": "$self" @@ -3021,7 +3777,7 @@ "name": "constant.character.escape.latex" }, { - "include": "text.tex#math" + "include": "text.tex#math-content" }, { "include": "$self" @@ -3048,7 +3804,7 @@ "name": "constant.character.escape.latex" }, { - "include": "text.tex#math" + "include": "text.tex#math-content" }, { "include": "$self" @@ -3071,7 +3827,7 @@ "name": "meta.math.block.latex support.class.math.block.environment.latex", "patterns": [ { - "include": "text.tex#math" + "include": "text.tex#math-content" }, { "include": "$self" @@ -3192,7 +3948,7 @@ "name": "punctuation.definition.arguments.end.latex" } }, - "match": "\\s*((\\\\)(?:begin|end))(\\{)([a-zA-Z]*\\*?)(\\})(?:(\\[)([^\\]]*)(\\])){,2}(?:(\\{)([^{}]*)(\\}))?" + "match": "\\s*((\\\\)(?:begin|end))(\\{)(\\p{Alphabetic}+\\*?)(\\})(?:(\\[)([^\\]]*)(\\])){,2}(?:(\\{)([^{}]*)(\\}))?" }, "definition-label": { "begin": "((\\\\)z?label)((?:\\[[^\\[]*?\\])*)(\\{)", @@ -3223,7 +3979,7 @@ "name": "meta.definition.label.latex", "patterns": [ { - "match": "[\\p{Alphabetic}\\p{Number}\\.,:/*!^_-]", + "match": "[\\p{Alphabetic}\\p{Number}\\.,:/*!^_-]+", "name": "variable.parameter.definition.label.latex" } ] @@ -3250,7 +4006,7 @@ ] }, "multiline-optional-arg-no-highlight": { - "begin": "\\G\\[", + "begin": "(?:\\G|(?<=\\}))\\s*\\[", "beginCaptures": { "0": { "name": "punctuation.definition.arguments.optional.begin.latex" @@ -3269,6 +4025,26 @@ } ] }, + "multiline-arg-no-highlight": { + "begin": "\\G\\{", + "beginCaptures": { + "0": { + "name": "punctuation.definition.arguments.begin.latex" + } + }, + "end": "\\}", + "endCaptures": { + "0": { + "name": "punctuation.definition.arguments.end.latex" + } + }, + "name": "meta.parameter.latex", + "patterns": [ + { + "include": "$self" + } + ] + }, "optional-arg-bracket": { "patterns": [ { @@ -3354,6 +4130,27 @@ "name": "meta.parameter.optional.latex" } ] + }, + "songs-chords": { + "patterns": [ + { + "begin": "\\\\\\[", + "end": "\\]", + "name": "meta.chord.block.latex support.class.chord.block.environment.latex", + "patterns": [ + { + "include": "$self" + } + ] + }, + { + "match": "\\^", + "name": "meta.chord.block.latex support.class.chord.block.environment.latex" + }, + { + "include": "$self" + } + ] } } } \ No newline at end of file diff --git a/org.eclipse.tm4e.language_pack/syntaxes/latex/markdown_latex_combined.tmLanguage.json b/org.eclipse.tm4e.language_pack/syntaxes/latex/markdown_latex_combined.tmLanguage.json index 566ede8e6..ff0815901 100644 --- a/org.eclipse.tm4e.language_pack/syntaxes/latex/markdown_latex_combined.tmLanguage.json +++ b/org.eclipse.tm4e.language_pack/syntaxes/latex/markdown_latex_combined.tmLanguage.json @@ -4,7 +4,7 @@ "If you want to provide a fix or improvement, please create a pull request against the original repository.", "Once accepted there, we are happy to receive an update request." ], - "version": "https://github.com/jlelong/vscode-latex-basics/commit/dfa69a16a1154dbc820dc1111d72faa6954dd1e2", + "version": "https://github.com/jlelong/vscode-latex-basics/commit/d689e50d5a02534f9385306b3d0225d78be4db85", "name": "Markdown", "scopeName": "text.tex.markdown_latex_combined", "patterns": [ diff --git a/org.eclipse.tm4e.language_pack/syntaxes/latex/tex.tmLanguage.json b/org.eclipse.tm4e.language_pack/syntaxes/latex/tex.tmLanguage.json index b3a328174..b31ccccb6 100644 --- a/org.eclipse.tm4e.language_pack/syntaxes/latex/tex.tmLanguage.json +++ b/org.eclipse.tm4e.language_pack/syntaxes/latex/tex.tmLanguage.json @@ -4,52 +4,40 @@ "If you want to provide a fix or improvement, please create a pull request against the original repository.", "Once accepted there, we are happy to receive an update request." ], - "version": "https://github.com/jlelong/vscode-latex-basics/commit/df6ef817c932d24da5cc72927344a547e463cc65", + "version": "https://github.com/jlelong/vscode-latex-basics/commit/6bd99800f7b2cbd0e36cecb56fe1936da5affadb", "name": "TeX", "scopeName": "text.tex", "patterns": [ { - "begin": "(?<=^\\s*)((\\\\)iffalse)(?!\\s*[{}]\\s*\\\\fi)", - "beginCaptures": { - "1": { - "name": "keyword.control.tex" - }, - "2": { - "name": "punctuation.definition.keyword.tex" - } - }, - "contentName": "comment.line.percentage.tex", - "end": "((\\\\)(?:else|fi))", - "endCaptures": { - "1": { - "name": "keyword.control.tex" - }, - "2": { - "name": "punctuation.definition.keyword.tex" - } - }, - "patterns": [ - { - "include": "#comment" - }, - { - "include": "#braces" - }, - { - "include": "#conditionals" - } - ] + "include": "#iffalse-block" }, { - "captures": { - "1": { - "name": "punctuation.definition.keyword.tex" - } - }, - "match": "(\\\\)(backmatter|csname|else|endcsname|fi|frontmatter|mainmatter|unless|if(case|cat|csname|defined|dim|eof|false|fontchar|hbox|hmode|inner|mmode|num|odd|true|vbox|vmode|void|x)?)(?![a-zA-Z@])", - "name": "keyword.control.tex" + "include": "#macro-control" + }, + { + "include": "#catcode" + }, + { + "include": "#comment" + }, + { + "match": "[\\[\\]]", + "name": "punctuation.definition.brackets.tex" }, { + "include": "#dollar-math" + }, + { + "match": "\\\\\\\\", + "name": "keyword.control.newline.tex" + }, + { + "include": "#macro-general" + } + ], + "repository": { + "catcode": { + "match": "((\\\\)catcode)`(?:\\\\)?.(=)(\\d+)", "captures": { "1": { "name": "keyword.control.catcode.tex" @@ -64,85 +52,49 @@ "name": "constant.numeric.category.tex" } }, - "match": "((\\\\)catcode)`(?:\\\\)?.(=)(\\d+)", "name": "meta.catcode.tex" }, - { - "include": "#comment" - }, - { - "match": "[\\[\\]]", - "name": "punctuation.definition.brackets.tex" - }, - { - "begin": "(\\$\\$|\\$)", + "iffalse-block": { + "begin": "(?<=^\\s*)((\\\\)iffalse)(?!\\s*[{}]\\s*\\\\fi\\b)", "beginCaptures": { "1": { - "name": "punctuation.definition.string.begin.tex" + "name": "keyword.control.tex" + }, + "2": { + "name": "punctuation.definition.keyword.tex" } }, - "end": "(\\1)", + "contentName": "comment.line.percentage.tex", + "end": "((\\\\)(?:else|fi)\\b)", "endCaptures": { "1": { - "name": "punctuation.definition.string.end.tex" + "name": "keyword.control.tex" + }, + "2": { + "name": "punctuation.definition.keyword.tex" } }, - "name": "meta.math.block.tex support.class.math.block.tex", "patterns": [ { - "match": "\\\\\\$", - "name": "constant.character.escape.tex" + "include": "#comment" }, { - "include": "#math" + "include": "#braces" }, { - "include": "$self" + "include": "#conditionals" } ] }, - { - "match": "\\\\\\\\", - "name": "keyword.control.newline.tex" - }, - { - "captures": { - "1": { - "name": "punctuation.definition.function.tex" - } - }, - "match": "(\\\\)_*[\\p{Alphabetic}@]+(?:_[\\p{Alphabetic}@]+)*:[NncVvoxefTFpwD]*", - "name": "support.class.general.latex3.tex" - }, - { - "captures": { - "1": { - "name": "punctuation.definition.function.tex" - } - }, - "match": "(\\.)[\\p{Alphabetic}@]+(?:_[\\p{Alphabetic}@]+)*:[NncVvoxefTFpwD]*", - "name": "support.class.general.latex3.tex" - }, - { - "captures": { - "1": { - "name": "punctuation.definition.function.tex" - } - }, - "match": "(\\\\)(?:[,;]|(?:[\\p{Alphabetic}@]+))", - "name": "support.function.general.tex" - }, - { + "macro-control": { + "match": "(\\\\)(backmatter|csname|else|endcsname|fi|frontmatter|mainmatter|unless|if(case|cat|csname|defined|dim|eof|false|fontchar|hbox|hmode|inner|mmode|num|odd|true|vbox|vmode|void|x)?)(?![a-zA-Z@])", "captures": { "1": { "name": "punctuation.definition.keyword.tex" } }, - "match": "(\\\\)[^a-zA-Z@]", - "name": "constant.character.escape.tex" - } - ], - "repository": { + "name": "keyword.control.tex" + }, "braces": { "begin": "(?)", - "decreaseIndentPattern": "^(.*\\*\\/)?\\s*((\\})|(\\)+[;,])|(\\]\\)*[;,])|\\b(else:)|\\b((end(if|for(each)?|while|switch));))" + "decreaseIndentPattern": "^(.*\\*\\/)?\\s*((\\})|(\\)+[;,])|(\\]\\)*[;,])|\\b(else:)|\\b((end(if|for(each)?|while|switch));))", + // e.g. * ...| or */| or *-----*/| + "unIndentedLinePattern": { + "pattern": "^(\\t|[ ])*[ ]\\*[^/]*\\*/\\s*$|^(\\t|[ ])*[ ]\\*/\\s*$|^(\\t|[ ])*\\*([ ]([^\\*]|\\*(?!/))*)?$" + }, + "indentNextLinePattern": { + "pattern": "^\\s*(((if|else ?if|while|for|foreach)\\s*\\(.*\\)\\s*)|else\\s*)$" + } }, "folding": { "markers": { diff --git a/org.eclipse.tm4e.language_pack/syntaxes/php/php.tmLanguage.json b/org.eclipse.tm4e.language_pack/syntaxes/php/php.tmLanguage.json index 96821c677..3875a74b0 100644 --- a/org.eclipse.tm4e.language_pack/syntaxes/php/php.tmLanguage.json +++ b/org.eclipse.tm4e.language_pack/syntaxes/php/php.tmLanguage.json @@ -4,7 +4,7 @@ "If you want to provide a fix or improvement, please create a pull request against the original repository.", "Once accepted there, we are happy to receive an update request." ], - "version": "https://github.com/KapitanOczywisty/language-php/commit/5e8f000cb5a20f44f7a7a89d07ad0774031c53f3", + "version": "https://github.com/KapitanOczywisty/language-php/commit/b17fdadac1756fc13a0853c26fca2f0b4495c0bd", "scopeName": "source.php", "patterns": [ { @@ -698,12 +698,12 @@ "name": "punctuation.separator.delimiter.php" }, { - "begin": "(?xi)\n((?:(?:public|private|protected|readonly)(?:\\s+|(?=\\?)))++)\n(?: (\n # nullable type\n (?:\\?\\s*)? [a-z0-9_\\x{7f}-\\x{10ffff}\\\\]+ |\n # union, intersection or DNF type\n (?: [a-z0-9_\\x{7f}-\\x{10ffff}\\\\]+ | \\(\\s* [a-z0-9_\\x{7f}-\\x{10ffff}\\\\]+(?:\\s*&\\s*[a-z0-9_\\x{7f}-\\x{10ffff}\\\\]+)+ \\s*\\) )\n (?: \\s*[|&]\\s*\n (?: [a-z0-9_\\x{7f}-\\x{10ffff}\\\\]+ | \\(\\s* [a-z0-9_\\x{7f}-\\x{10ffff}\\\\]+(?:\\s*&\\s*[a-z0-9_\\x{7f}-\\x{10ffff}\\\\]+)+ \\s*\\) )\n )+\n) \\s+ )?\n((?:(&)\\s*)?(\\$)[a-z_\\x{7f}-\\x{10ffff}][a-z0-9_\\x{7f}-\\x{10ffff}]*) # Variable name with possible reference", + "begin": "(?xi)\n((?:(?:(?:public|private|protected)(?:\\(set\\))?|readonly)(?:\\s+|(?=\\?)))++)\n(?: (\n # nullable type\n (?:\\?\\s*)? [a-z0-9_\\x{7f}-\\x{10ffff}\\\\]+ |\n # union, intersection or DNF type\n (?: [a-z0-9_\\x{7f}-\\x{10ffff}\\\\]+ | \\(\\s* [a-z0-9_\\x{7f}-\\x{10ffff}\\\\]+(?:\\s*&\\s*[a-z0-9_\\x{7f}-\\x{10ffff}\\\\]+)+ \\s*\\) )\n (?: \\s*[|&]\\s*\n (?: [a-z0-9_\\x{7f}-\\x{10ffff}\\\\]+ | \\(\\s* [a-z0-9_\\x{7f}-\\x{10ffff}\\\\]+(?:\\s*&\\s*[a-z0-9_\\x{7f}-\\x{10ffff}\\\\]+)+ \\s*\\) )\n )+\n) \\s+ )?\n((?:(&)\\s*)?(\\$)[a-z_\\x{7f}-\\x{10ffff}][a-z0-9_\\x{7f}-\\x{10ffff}]*) # Variable name with possible reference", "beginCaptures": { "1": { "patterns": [ { - "match": "public|private|protected|readonly", + "match": "(?:public|private|protected)(?:\\(set\\))?|readonly", "name": "storage.modifier.php" } ] @@ -809,12 +809,12 @@ ] }, { - "match": "(?xi)\n((?:(?:public|private|protected|static|readonly)(?:\\s+|(?=\\?)))++) # At least one modifier\n(\n # nullable type\n (?:\\?\\s*)? [a-z0-9_\\x{7f}-\\x{10ffff}\\\\]+ |\n # union, intersection or DNF type\n (?: [a-z0-9_\\x{7f}-\\x{10ffff}\\\\]+ | \\(\\s* [a-z0-9_\\x{7f}-\\x{10ffff}\\\\]+(?:\\s*&\\s*[a-z0-9_\\x{7f}-\\x{10ffff}\\\\]+)+ \\s*\\) )\n (?: \\s*[|&]\\s*\n (?: [a-z0-9_\\x{7f}-\\x{10ffff}\\\\]+ | \\(\\s* [a-z0-9_\\x{7f}-\\x{10ffff}\\\\]+(?:\\s*&\\s*[a-z0-9_\\x{7f}-\\x{10ffff}\\\\]+)+ \\s*\\) )\n )+\n)?\n\\s+ ((\\$)[a-z_\\x{7f}-\\x{10ffff}][a-z0-9_\\x{7f}-\\x{10ffff}]*) # Variable name", + "match": "(?xi)\n((?:(?:(?:public|private|protected)(?:\\(set\\))?|static|readonly)(?:\\s+|(?=\\?)))++) # At least one modifier\n(\n # nullable type\n (?:\\?\\s*)? [a-z0-9_\\x{7f}-\\x{10ffff}\\\\]+ |\n # union, intersection or DNF type\n (?: [a-z0-9_\\x{7f}-\\x{10ffff}\\\\]+ | \\(\\s* [a-z0-9_\\x{7f}-\\x{10ffff}\\\\]+(?:\\s*&\\s*[a-z0-9_\\x{7f}-\\x{10ffff}\\\\]+)+ \\s*\\) )\n (?: \\s*[|&]\\s*\n (?: [a-z0-9_\\x{7f}-\\x{10ffff}\\\\]+ | \\(\\s* [a-z0-9_\\x{7f}-\\x{10ffff}\\\\]+(?:\\s*&\\s*[a-z0-9_\\x{7f}-\\x{10ffff}\\\\]+)+ \\s*\\) )\n )+\n)?\n\\s+ ((\\$)[a-z_\\x{7f}-\\x{10ffff}][a-z0-9_\\x{7f}-\\x{10ffff}]*) # Variable name", "captures": { "1": { "patterns": [ { - "match": "public|private|protected|static|readonly", + "match": "(?:public|private|protected)(?:\\(set\\))?|static|readonly", "name": "storage.modifier.php" } ] @@ -903,7 +903,11 @@ "name": "storage.type.php" }, { - "match": "(?i)\\b(global|abstract|const|final|private|protected|public|static)\\b", + "match": "(?i)\\bconst\\b", + "name": "storage.type.const.php" + }, + { + "match": "(?i)\\b(global|abstract|final|private|protected|public|static)\\b", "name": "storage.modifier.php" }, { @@ -1025,7 +1029,7 @@ "name": "entity.name.goto-label.php" } }, - "match": "(?i)^\\s*([a-z_\\x{7f}-\\x{10ffff}][a-z0-9_\\x{7f}-\\x{10ffff}]*(?|->>)", - "name": "keyword.operator.assignment.r" - }, - { - "match": "(==|<=|>=|!=|<>|<|>|%in%)", - "name": "keyword.operator.comparison.r" - }, - { - "match": "(!|&{1,2}|[|]{1,2})", - "name": "keyword.operator.logical.r" - }, - { - "match": "(\\|>)", - "name": "keyword.operator.pipe.r" - }, - { - "match": "(%between%|%chin%|%like%|%\\+%|%\\+replace%|%:%|%do%|%dopar%|%>%|%<>%|%T>%|%\\$%)", - "name": "keyword.operator.other.r" - }, - { - "match": "(\\.\\.\\.|\\$|:|\\~|@)", - "name": "keyword.other.r" - } - ] - }, - "storage-type": { - "patterns": [ - { - "match": "\\b(character|complex|double|expression|integer|list|logical|numeric|single|raw)\\b(?=\\s*\\()", - "name": "storage.type.r" - } - ] - }, - "strings": { - "patterns": [ - { - "begin": "[rR]\"(-*)\\[", - "beginCaptures": { - "0": { - "name": "punctuation.definition.string.raw.begin.r" - } - }, - "end": "\\]\\1\"", - "endCaptures": { - "0": { - "name": "punctuation.definition.string.raw.end.r" - } - }, - "name": "string.quoted.double.raw.r" - }, - { - "begin": "[rR]'(-*)\\[", - "beginCaptures": { - "0": { - "name": "punctuation.definition.string.raw.begin.r" - } - }, - "end": "\\]\\1'", - "endCaptures": { - "0": { - "name": "punctuation.definition.string.raw.end.r" - } - }, - "name": "string.quoted.single.raw.r" - }, - { - "begin": "[rR]\"(-*)\\{", - "beginCaptures": { - "0": { - "name": "punctuation.definition.string.raw.begin.r" - } - }, - "end": "\\}\\1\"", - "endCaptures": { - "0": { - "name": "punctuation.definition.string.raw.end.r" - } - }, - "name": "string.quoted.double.raw.r" - }, - { - "begin": "[rR]'(-*)\\{", - "beginCaptures": { - "0": { - "name": "punctuation.definition.string.raw.begin.r" - } - }, - "end": "\\}\\1'", - "endCaptures": { - "0": { - "name": "punctuation.definition.string.raw.end.r" - } - }, - "name": "string.quoted.single.raw.r" - }, - { - "begin": "[rR]\"(-*)\\(", - "beginCaptures": { - "0": { - "name": "punctuation.definition.string.raw.begin.r" - } - }, - "end": "\\)\\1\"", - "endCaptures": { - "0": { - "name": "punctuation.definition.string.raw.end.r" - } - }, - "name": "string.quoted.double.raw.r" - }, - { - "begin": "[rR]'(-*)\\(", - "beginCaptures": { - "0": { - "name": "punctuation.definition.string.raw.begin.r" - } - }, - "end": "\\)\\1'", - "endCaptures": { - "0": { - "name": "punctuation.definition.string.raw.end.r" - } - }, - "name": "string.quoted.single.raw.r" - }, - { - "begin": "\"", - "beginCaptures": { - "0": { - "name": "punctuation.definition.string.begin.r" - } - }, - "end": "\"", - "endCaptures": { - "0": { - "name": "punctuation.definition.string.end.r" - } - }, - "name": "string.quoted.double.r", - "patterns": [ - { - "match": "\\\\.", - "name": "constant.character.escape.r" + "include": "#function-calls" } ] }, { - "begin": "'", + "begin": "(:::?)(?=(?:[a-zA-Z._][\\w.]*|`[^`]+`))", "beginCaptures": { - "0": { - "name": "punctuation.definition.string.begin.r" - } - }, - "end": "'", - "endCaptures": { - "0": { - "name": "punctuation.definition.string.end.r" + "1": { + "name": "punctuation.accessor.colons.r" } }, - "name": "string.quoted.single.r", + "end": "(?!\\G)", "patterns": [ { - "match": "\\\\.", - "name": "constant.character.escape.r" + "include": "#function-calls" } ] } @@ -351,13 +90,13 @@ "begin": "\\(", "beginCaptures": { "0": { - "name": "punctuation.section.parens.begin.r" + "name": "punctuation.section.parameters.begin.bracket.round.r" } }, "end": "\\)", "endCaptures": { "0": { - "name": "punctuation.section.parens.end.r" + "name": "punctuation.section.parameters.end.bracket.round.r" } }, "patterns": [ @@ -386,6 +125,7 @@ ] }, { + "contentName": "meta.item-access.arguments.r", "begin": "\\[\\[", "beginCaptures": { "0": { @@ -398,7 +138,6 @@ "name": "punctuation.section.brackets.double.end.r" } }, - "contentName": "meta.item-access.arguments.r", "patterns": [ { "include": "source.r" @@ -409,13 +148,13 @@ "begin": "\\{", "beginCaptures": { "0": { - "name": "punctuation.section.braces.begin.r" + "name": "punctuation.section.block.begin.bracket.curly.r" } }, "end": "\\}", "endCaptures": { "0": { - "name": "punctuation.section.braces.end.r" + "name": "punctuation.section.block.end.bracket.curly.r" } }, "patterns": [ @@ -426,130 +165,524 @@ } ] }, - "function-declarations": { + "builtin-functions": { "patterns": [ { - "match": "((?:`[^`\\\\]*(?:\\\\.[^`\\\\]*)*`)|(?:[[:alpha:].][[:alnum:]._]*))\\s*(>)" }, { - "include": "source.r" + "name": "keyword.operator.other.r", + "match": "%(between|chin|do|dopar|in|like|\\+replace|\\+|:|T>|<>|>|\\$)%" + }, + { + "name": "keyword.other.r", + "match": "\\.\\.\\." + }, + { + "name": "punctuation.accessor.colons.r", + "match": ":::?" + }, + { + "name": "keyword.operator.arithmetic.r", + "match": "(%%|\\*\\*)" + }, + { + "name": "keyword.operator.assignment.r", + "match": "(<-|->)" + }, + { + "name": "keyword.operator.pipe.r", + "match": "\\|>" + }, + { + "name": "keyword.operator.comparison.r", + "match": "(==|!=|<>|<=?|>=?)" + }, + { + "name": "keyword.operator.logical.r", + "match": "(&&?|\\|\\|?)" + }, + { + "name": "keyword.operator.other.r", + "match": ":=" + }, + { + "name": "keyword.operator.arithmetic.r", + "match": "[-+*/^]" + }, + { + "name": "keyword.operator.assignment.r", + "match": "=" + }, + { + "name": "keyword.operator.logical.r", + "match": "!" + }, + { + "name": "keyword.other.r", + "match": "[:~@]" + }, + { + "name": "punctuation.terminator.semicolon.r", + "match": ";" } ] }, "roxygen": { "patterns": [ { + "name": "comment.line.roxygen.r", "begin": "^\\s*(#')\\s*", "beginCaptures": { "1": { @@ -557,9 +690,9 @@ } }, "end": "$\\n?", - "name": "comment.line.roxygen.r", "patterns": [ { + "match": "(@param)\\s*((?:[a-zA-Z._][\\w.]*|`[^`]+`))", "captures": { "1": { "name": "keyword.other.r" @@ -567,66 +700,177 @@ "2": { "name": "variable.parameter.r" } - }, - "match": "(@param)\\s*((?:[a-zA-Z._][\\w.]*|`[^`]+`))" + } }, { - "match": "@[a-zA-Z0-9]+", - "name": "keyword.other.r" + "name": "keyword.other.r", + "match": "@[a-zA-Z0-9]+" } ] } ] }, - "builtin-functions": { + "storage-type": { "patterns": [ { - "match": "\\b(abbreviate|abs|acos|acosh|activeBindingFunction|addNA|addTaskCallback|agrep|agrepl|alist|all|all\\.equal|all\\.equal\\.character|all\\.equal\\.default|all\\.equal\\.environment|all\\.equal\\.envRefClass|all\\.equal\\.factor|all\\.equal\\.formula|all\\.equal\\.function|all\\.equal\\.language|all\\.equal\\.list|all\\.equal\\.numeric|all\\.equal\\.POSIXt|all\\.equal\\.raw|all\\.names|allowInterrupts|all\\.vars|any|anyDuplicated|anyDuplicated\\.array|anyDuplicated\\.data\\.frame|anyDuplicated\\.default|anyDuplicated\\.matrix|anyNA|anyNA\\.data\\.frame|anyNA\\.numeric_version|anyNA\\.POSIXlt|aperm|aperm\\.default|aperm\\.table|append|apply|Arg|args|array|arrayInd|as\\.array|as\\.array\\.default|as\\.call|as\\.character|as\\.character\\.condition|as\\.character\\.Date|as\\.character\\.default|as\\.character\\.error|as\\.character\\.factor|as\\.character\\.hexmode|as\\.character\\.numeric_version|as\\.character\\.octmode|as\\.character\\.POSIXt|as\\.character\\.srcref|as\\.complex|as\\.data\\.frame|as\\.data\\.frame\\.array|as\\.data\\.frame\\.AsIs|as\\.data\\.frame\\.character|as\\.data\\.frame\\.complex|as\\.data\\.frame\\.data\\.frame|as\\.data\\.frame\\.Date|as\\.data\\.frame\\.default|as\\.data\\.frame\\.difftime|as\\.data\\.frame\\.factor|as\\.data\\.frame\\.integer|as\\.data\\.frame\\.list|as\\.data\\.frame\\.logical|as\\.data\\.frame\\.matrix|as\\.data\\.frame\\.model\\.matrix|as\\.data\\.frame\\.noquote|as\\.data\\.frame\\.numeric|as\\.data\\.frame\\.numeric_version|as\\.data\\.frame\\.ordered|as\\.data\\.frame\\.POSIXct|as\\.data\\.frame\\.POSIXlt|as\\.data\\.frame\\.raw|as\\.data\\.frame\\.table|as\\.data\\.frame\\.ts|as\\.data\\.frame\\.vector|as\\.Date|as\\.Date\\.character|as\\.Date\\.default|as\\.Date\\.factor|as\\.Date\\.numeric|as\\.Date\\.POSIXct|as\\.Date\\.POSIXlt|as\\.difftime|as\\.double|as\\.double\\.difftime|as\\.double\\.POSIXlt|as\\.environment|as\\.expression|as\\.expression\\.default|as\\.factor|as\\.function|as\\.function\\.default|as\\.hexmode|asin|asinh|as\\.integer|as\\.list|as\\.list\\.data\\.frame|as\\.list\\.Date|as\\.list\\.default|as\\.list\\.difftime|as\\.list\\.environment|as\\.list\\.factor|as\\.list\\.function|as\\.list\\.numeric_version|as\\.list\\.POSIXct|as\\.list\\.POSIXlt|as\\.logical|as\\.logical\\.factor|as\\.matrix|as\\.matrix\\.data\\.frame|as\\.matrix\\.default|as\\.matrix\\.noquote|as\\.matrix\\.POSIXlt|as\\.name|asNamespace|as\\.null|as\\.null\\.default|as\\.numeric|as\\.numeric_version|as\\.octmode|as\\.ordered|as\\.package_version|as\\.pairlist|asplit|as\\.POSIXct|as\\.POSIXct\\.Date|as\\.POSIXct\\.default|as\\.POSIXct\\.numeric|as\\.POSIXct\\.POSIXlt|as\\.POSIXlt|as\\.POSIXlt\\.character|as\\.POSIXlt\\.Date|as\\.POSIXlt\\.default|as\\.POSIXlt\\.factor|as\\.POSIXlt\\.numeric|as\\.POSIXlt\\.POSIXct|as\\.qr|as\\.raw|asS3|asS4|assign|as\\.single|as\\.single\\.default|as\\.symbol|as\\.table|as\\.table\\.default|as\\.vector|as\\.vector\\.factor|atan|atan2|atanh|attach|attachNamespace|attr|attr\\.all\\.equal|attributes|autoload|autoloader|backsolve|baseenv|basename|besselI|besselJ|besselK|besselY|beta|bindingIsActive|bindingIsLocked|bindtextdomain|bitwAnd|bitwNot|bitwOr|bitwShiftL|bitwShiftR|bitwXor|body|bquote|break|browser|browserCondition|browserSetDebug|browserText|builtins|by|by\\.data\\.frame|by\\.default|bzfile|c|call|callCC|capabilities|casefold|cat|cbind|cbind\\.data\\.frame|c\\.Date|c\\.difftime|ceiling|c\\.factor|character|char\\.expand|charmatch|charToRaw|chartr|check_tzones|chkDots|chol|chol2inv|chol\\.default|choose|class|clearPushBack|close|closeAllConnections|close\\.connection|close\\.srcfile|close\\.srcfilealias|c\\.noquote|c\\.numeric_version|col|colMeans|colnames|colSums|commandArgs|comment|complex|computeRestarts|conditionCall|conditionCall\\.condition|conditionMessage|conditionMessage\\.condition|conflictRules|conflicts|Conj|contributors|cos|cosh|cospi|c\\.POSIXct|c\\.POSIXlt|crossprod|Cstack_info|cummax|cummin|cumprod|cumsum|curlGetHeaders|cut|cut\\.Date|cut\\.default|cut\\.POSIXt|c\\.warnings|data\\.class|data\\.frame|data\\.matrix|date|debug|debuggingState|debugonce|default\\.stringsAsFactors|delayedAssign|deparse|deparse1|det|detach|determinant|determinant\\.matrix|dget|diag|diff|diff\\.Date|diff\\.default|diff\\.difftime|diff\\.POSIXt|difftime|digamma|dim|dim\\.data\\.frame|dimnames|dimnames\\.data\\.frame|dir|dir\\.create|dir\\.exists|dirname|do\\.call|dontCheck|double|dput|dQuote|drop|droplevels|droplevels\\.data\\.frame|droplevels\\.factor|dump|duplicated|duplicated\\.array|duplicated\\.data\\.frame|duplicated\\.default|duplicated\\.matrix|duplicated\\.numeric_version|duplicated\\.POSIXlt|duplicated\\.warnings|dynGet|dyn\\.load|dyn\\.unload|eapply|eigen|emptyenv|enc2native|enc2utf8|encodeString|Encoding|endsWith|enquote|environment|environmentIsLocked|environmentName|env\\.profile|errorCondition|eval|eval\\.parent|evalq|exists|exp|expand\\.grid|expm1|expression|extSoftVersion|factor|factorial|fifo|file|file\\.access|file\\.append|file\\.choose|file\\.copy|file\\.create|file\\.exists|file\\.info|file\\.link|file\\.mode|file\\.mtime|file\\.path|file\\.remove|file\\.rename|file\\.show|file\\.size|file\\.symlink|Filter|Find|findInterval|find\\.package|findPackageEnv|findRestart|floor|flush|flush\\.connection|for|force|forceAndCall|formals|format|format\\.AsIs|formatC|format\\.data\\.frame|format\\.Date|format\\.default|format\\.difftime|formatDL|format\\.factor|format\\.hexmode|format\\.info|format\\.libraryIQR|format\\.numeric_version|format\\.octmode|format\\.packageInfo|format\\.POSIXct|format\\.POSIXlt|format\\.pval|format\\.summaryDefault|forwardsolve|function|gamma|gc|gcinfo|gc\\.time|gctorture|gctorture2|get|get0|getAllConnections|getCallingDLL|getCallingDLLe|getConnection|getDLLRegisteredRoutines|getDLLRegisteredRoutines\\.character|getDLLRegisteredRoutines\\.DLLInfo|getElement|geterrmessage|getExportedValue|getHook|getLoadedDLLs|getNamespace|getNamespaceExports|getNamespaceImports|getNamespaceInfo|getNamespaceName|getNamespaceUsers|getNamespaceVersion|getNativeSymbolInfo|getOption|getRversion|getSrcLines|getTaskCallbackNames|gettext|gettextf|getwd|gl|globalCallingHandlers|globalenv|gregexec|gregexpr|grep|grepl|grepRaw|grouping|gsub|gzcon|gzfile|I|iconv|iconvlist|icuGetCollate|icuSetCollate|identical|identity|if|ifelse|Im|importIntoEnv|infoRDS|inherits|integer|interaction|interactive|intersect|intToBits|intToUtf8|inverse\\.rle|invisible|invokeRestart|invokeRestartInteractively|isa|is\\.array|is\\.atomic|isatty|isBaseNamespace|is\\.call|is\\.character|is\\.complex|is\\.data\\.frame|isdebugged|is\\.double|is\\.element|is\\.environment|is\\.expression|is\\.factor|isFALSE|is\\.finite|is\\.function|isIncomplete|is\\.infinite|is\\.integer|is\\.language|is\\.list|is\\.loaded|is\\.logical|is\\.matrix|is\\.na|is\\.na\\.data\\.frame|is\\.name|isNamespace|isNamespaceLoaded|is\\.nan|is\\.na\\.numeric_version|is\\.na\\.POSIXlt|is\\.null|is\\.numeric|is\\.numeric\\.Date|is\\.numeric\\.difftime|is\\.numeric\\.POSIXt|is\\.numeric_version|is\\.object|ISOdate|ISOdatetime|isOpen|is\\.ordered|is\\.package_version|is\\.pairlist|is\\.primitive|is\\.qr|is\\.R|is\\.raw|is\\.recursive|isRestart|isS4|isSeekable|is\\.single|is\\.symbol|isSymmetric|isSymmetric\\.matrix|is\\.table|isTRUE|is\\.unsorted|is\\.vector|jitter|julian|julian\\.Date|julian\\.POSIXt|kappa|kappa\\.default|kappa\\.lm|kappa\\.qr|kronecker|l10n_info|labels|labels\\.default|La_library|lapply|La\\.svd|La_version|lazyLoad|lazyLoadDBexec|lazyLoadDBfetch|lbeta|lchoose|length|length\\.POSIXlt|lengths|levels|levels\\.default|lfactorial|lgamma|libcurlVersion|library|library\\.dynam|library\\.dynam\\.unload|licence|license|list|list2DF|list2env|list\\.dirs|list\\.files|load|loadedNamespaces|loadingNamespaceInfo|loadNamespace|local|lockBinding|lockEnvironment|log|log10|log1p|log2|logb|logical|lower\\.tri|ls|makeActiveBinding|make\\.names|make\\.unique|Map|mapply|marginSums|margin\\.table|match|match\\.arg|match\\.call|match\\.fun|Math\\.data\\.frame|Math\\.Date|Math\\.difftime|Math\\.factor|Math\\.POSIXt|mat\\.or\\.vec|matrix|max|max\\.col|mean|mean\\.Date|mean\\.default|mean\\.difftime|mean\\.POSIXct|mean\\.POSIXlt|memCompress|memDecompress|mem\\.maxNSize|mem\\.maxVSize|memory\\.profile|merge|merge\\.data\\.frame|merge\\.default|message|mget|min|missing|Mod|mode|months|months\\.Date|months\\.POSIXt|names|namespaceExport|namespaceImport|namespaceImportClasses|namespaceImportFrom|namespaceImportMethods|names\\.POSIXlt|nargs|nchar|ncol|NCOL|Negate|new\\.env|next|NextMethod|ngettext|nlevels|noquote|norm|normalizePath|nrow|NROW|nullfile|numeric|numeric_version|numToBits|numToInts|nzchar|objects|oldClass|OlsonNames|on\\.exit|open|open\\.connection|open\\.srcfile|open\\.srcfilealias|open\\.srcfilecopy|Ops\\.data\\.frame|Ops\\.Date|Ops\\.difftime|Ops\\.factor|Ops\\.numeric_version|Ops\\.ordered|Ops\\.POSIXt|options|order|ordered|outer|packageEvent|packageHasNamespace|packageNotFoundError|packageStartupMessage|package_version|packBits|pairlist|parent\\.env|parent\\.frame|parse|parseNamespaceFile|paste|paste0|path\\.expand|path\\.package|pcre_config|pi|pipe|plot|pmatch|pmax|pmax\\.int|pmin|pmin\\.int|polyroot|Position|pos\\.to\\.env|pretty|pretty\\.default|prettyNum|print|print\\.AsIs|print\\.by|print\\.condition|print\\.connection|print\\.data\\.frame|print\\.Date|print\\.default|print\\.difftime|print\\.Dlist|print\\.DLLInfo|print\\.DLLInfoList|print\\.DLLRegisteredRoutines|print\\.eigen|print\\.factor|print\\.function|print\\.hexmode|print\\.libraryIQR|print\\.listof|print\\.NativeRoutineList|print\\.noquote|print\\.numeric_version|print\\.octmode|print\\.packageInfo|print\\.POSIXct|print\\.POSIXlt|print\\.proc_time|print\\.restart|print\\.rle|print\\.simple\\.list|print\\.srcfile|print\\.srcref|print\\.summaryDefault|print\\.summary\\.table|print\\.summary\\.warnings|print\\.table|print\\.warnings|prmatrix|proc\\.time|prod|proportions|prop\\.table|provideDimnames|psigamma|pushBack|pushBackLength|q|qr|qr\\.coef|qr\\.default|qr\\.fitted|qr\\.Q|qr\\.qty|qr\\.qy|qr\\.R|qr\\.resid|qr\\.solve|qr\\.X|quarters|quarters\\.Date|quarters\\.POSIXt|quit|quote|range|range\\.default|rank|rapply|raw|rawConnection|rawConnectionValue|rawShift|rawToBits|rawToChar|rbind|rbind\\.data\\.frame|rcond|Re|readBin|readChar|read\\.dcf|readline|readLines|readRDS|readRenviron|Recall|Reduce|regexec|regexpr|reg\\.finalizer|registerS3method|registerS3methods|regmatches|remove|removeTaskCallback|rep|rep\\.Date|rep\\.difftime|repeat|rep\\.factor|rep\\.int|replace|rep_len|replicate|rep\\.numeric_version|rep\\.POSIXct|rep\\.POSIXlt|require|requireNamespace|restartDescription|restartFormals|retracemem|return|returnValue|rev|rev\\.default|R\\.home|rle|rm|RNGkind|RNGversion|round|round\\.Date|round\\.POSIXt|row|rowMeans|rownames|row\\.names|row\\.names\\.data\\.frame|row\\.names\\.default|rowsum|rowsum\\.data\\.frame|rowsum\\.default|rowSums|R_system_version|R\\.version|R\\.Version|R\\.version\\.string|sample|sample\\.int|sapply|save|save\\.image|saveRDS|scale|scale\\.default|scan|search|searchpaths|seek|seek\\.connection|seq|seq_along|seq\\.Date|seq\\.default|seq\\.int|seq_len|seq\\.POSIXt|sequence|sequence\\.default|serialize|serverSocket|setdiff|setequal|setHook|setNamespaceInfo|set\\.seed|setSessionTimeLimit|setTimeLimit|setwd|showConnections|shQuote|sign|signalCondition|signif|simpleCondition|simpleError|simpleMessage|simpleWarning|simplify2array|sin|single|sinh|sink|sink\\.number|sinpi|slice\\.index|socketAccept|socketConnection|socketSelect|socketTimeout|solve|solve\\.default|solve\\.qr|sort|sort\\.default|sort\\.int|sort\\.list|sort\\.POSIXlt|source|split|split\\.data\\.frame|split\\.Date|split\\.default|split\\.POSIXct|sprintf|sqrt|sQuote|srcfile|srcfilealias|srcfilecopy|srcref|standardGeneric|startsWith|stderr|stdin|stdout|stop|stopifnot|storage\\.mode|str2expression|str2lang|strftime|strptime|strrep|strsplit|strtoi|strtrim|structure|strwrap|sub|subset|subset\\.data\\.frame|subset\\.default|subset\\.matrix|substitute|substr|substring|sum|summary|summary\\.connection|summary\\.data\\.frame|Summary\\.data\\.frame|summary\\.Date|Summary\\.Date|summary\\.default|Summary\\.difftime|summary\\.factor|Summary\\.factor|summary\\.matrix|Summary\\.numeric_version|Summary\\.ordered|summary\\.POSIXct|Summary\\.POSIXct|summary\\.POSIXlt|Summary\\.POSIXlt|summary\\.proc_time|summary\\.srcfile|summary\\.srcref|summary\\.table|summary\\.warnings|suppressMessages|suppressPackageStartupMessages|suppressWarnings|suspendInterrupts|svd|sweep|switch|sys\\.call|sys\\.calls|Sys\\.chmod|Sys\\.Date|sys\\.frame|sys\\.frames|sys\\.function|Sys\\.getenv|Sys\\.getlocale|Sys\\.getpid|Sys\\.glob|Sys\\.info|sys\\.load\\.image|Sys\\.localeconv|sys\\.nframe|sys\\.on\\.exit|sys\\.parent|sys\\.parents|Sys\\.readlink|sys\\.save\\.image|Sys\\.setenv|Sys\\.setFileTime|Sys\\.setlocale|Sys\\.sleep|sys\\.source|sys\\.status|system|system2|system\\.file|system\\.time|Sys\\.time|Sys\\.timezone|Sys\\.umask|Sys\\.unsetenv|Sys\\.which|t|table|tabulate|tan|tanh|tanpi|tapply|taskCallbackManager|tcrossprod|t\\.data\\.frame|t\\.default|tempdir|tempfile|textConnection|textConnectionValue|tolower|topenv|toString|toString\\.default|toupper|trace|traceback|tracemem|tracingState|transform|transform\\.data\\.frame|transform\\.default|trigamma|trimws|trunc|truncate|truncate\\.connection|trunc\\.Date|trunc\\.POSIXt|try|tryCatch|tryInvokeRestart|typeof|unclass|undebug|union|unique|unique\\.array|unique\\.data\\.frame|unique\\.default|unique\\.matrix|unique\\.numeric_version|unique\\.POSIXlt|unique\\.warnings|units|units\\.difftime|unix\\.time|unlink|unlist|unloadNamespace|unlockBinding|unname|unserialize|unsplit|untrace|untracemem|unz|upper\\.tri|url|UseMethod|utf8ToInt|validEnc|validUTF8|vapply|vector|Vectorize|version|warning|warningCondition|warnings|weekdays|weekdays\\.Date|weekdays\\.POSIXt|which|which\\.max|which\\.min|while|with|withAutoprint|withCallingHandlers|with\\.default|within|within\\.data\\.frame|within\\.list|withRestarts|withVisible|write|writeBin|writeChar|write\\.dcf|writeLines|xor|xpdrows\\.data\\.frame|xtfrm|xtfrm\\.AsIs|xtfrm\\.data\\.frame|xtfrm\\.Date|xtfrm\\.default|xtfrm\\.difftime|xtfrm\\.factor|xtfrm\\.numeric_version|xtfrm\\.POSIXct|xtfrm\\.POSIXlt|xzfile|zapsmall)\\s*(\\()", - "captures": { + "name": "meta.function-call.r", + "contentName": "meta.function-call.arguments.r", + "begin": "\\b(character|complex|double|expression|integer|list|logical|numeric|single|raw|pairlist)\\b\\s*(\\()", + "beginCaptures": { "1": { - "name": "support.function.r" + "name": "storage.type.r" + }, + "2": { + "name": "punctuation.definition.arguments.begin.r" + } + }, + "end": "(\\))", + "endCaptures": { + "1": { + "name": "punctuation.definition.arguments.end.r" + } + }, + "patterns": [ + { + "include": "#function-call-arguments" + } + ] + } + ] + }, + "strings": { + "patterns": [ + { + "name": "string.quoted.double.raw.r", + "begin": "[rR]\"(-*)\\[", + "beginCaptures": { + "0": { + "name": "punctuation.definition.string.raw.begin.r" + } + }, + "end": "\\]\\1\"", + "endCaptures": { + "0": { + "name": "punctuation.definition.string.raw.end.r" } } }, { - "match": "\\b(abline|arrows|assocplot|axis|Axis|axis\\.Date|axis\\.POSIXct|axTicks|barplot|barplot\\.default|box|boxplot|boxplot\\.default|boxplot\\.matrix|bxp|cdplot|clip|close\\.screen|co\\.intervals|contour|contour\\.default|coplot|curve|dotchart|erase\\.screen|filled\\.contour|fourfoldplot|frame|grconvertX|grconvertY|grid|hist|hist\\.default|identify|image|image\\.default|layout|layout\\.show|lcm|legend|lines|lines\\.default|locator|matlines|matplot|matpoints|mosaicplot|mtext|pairs|pairs\\.default|panel\\.smooth|par|persp|pie|plot|plot\\.default|plot\\.design|plot\\.function|plot\\.new|plot\\.window|plot\\.xy|points|points\\.default|polygon|polypath|rasterImage|rect|rug|screen|segments|smoothScatter|spineplot|split\\.screen|stars|stem|strheight|stripchart|strwidth|sunflowerplot|symbols|text|text\\.default|title|xinch|xspline|xyinch|yinch)\\s*(\\()", - "captures": { - "1": { - "name": "support.function.r" + "name": "string.quoted.single.raw.r", + "begin": "[rR]'(-*)\\[", + "beginCaptures": { + "0": { + "name": "punctuation.definition.string.raw.begin.r" + } + }, + "end": "\\]\\1'", + "endCaptures": { + "0": { + "name": "punctuation.definition.string.raw.end.r" } } }, { - "match": "\\b(adjustcolor|as\\.graphicsAnnot|as\\.raster|axisTicks|bitmap|blues9|bmp|boxplot\\.stats|cairo_pdf|cairo_ps|cairoSymbolFont|check\\.options|chull|CIDFont|cm|cm\\.colors|col2rgb|colorConverter|colorRamp|colorRampPalette|colors|colorspaces|colours|contourLines|convertColor|densCols|dev2bitmap|devAskNewPage|dev\\.capabilities|dev\\.capture|dev\\.control|dev\\.copy|dev\\.copy2eps|dev\\.copy2pdf|dev\\.cur|dev\\.flush|dev\\.hold|deviceIsInteractive|dev\\.interactive|dev\\.list|dev\\.new|dev\\.next|dev\\.off|dev\\.prev|dev\\.print|dev\\.set|dev\\.size|embedFonts|extendrange|getGraphicsEvent|getGraphicsEventEnv|graphics\\.off|gray|gray\\.colors|grey|grey\\.colors|grSoftVersion|hcl|hcl\\.colors|hcl\\.pals|heat\\.colors|Hershey|hsv|is\\.raster|jpeg|make\\.rgb|n2mfrow|nclass\\.FD|nclass\\.scott|nclass\\.Sturges|palette|palette\\.colors|palette\\.pals|pdf|pdfFonts|pdf\\.options|pictex|png|postscript|postscriptFonts|ps\\.options|quartz|quartzFont|quartzFonts|quartz\\.options|quartz\\.save|rainbow|recordGraphics|recordPlot|replayPlot|rgb|rgb2hsv|savePlot|setEPS|setGraphicsEventEnv|setGraphicsEventHandlers|setPS|svg|terrain\\.colors|tiff|topo\\.colors|trans3d|Type1Font|x11|X11|X11Font|X11Fonts|X11\\.options|xfig|xy\\.coords|xyTable|xyz\\.coords)\\s*(\\()", - "captures": { - "1": { - "name": "support.function.r" + "name": "string.quoted.double.raw.r", + "begin": "[rR]\"(-*)\\{", + "beginCaptures": { + "0": { + "name": "punctuation.definition.string.raw.begin.r" + } + }, + "end": "\\}\\1\"", + "endCaptures": { + "0": { + "name": "punctuation.definition.string.raw.end.r" } } }, { - "match": "\\b(addNextMethod|allNames|Arith|as|asMethodDefinition|assignClassDef|assignMethodsMetaData|balanceMethodsList|cacheGenericsMetaData|cacheMetaData|cacheMethod|callGeneric|callNextMethod|canCoerce|cbind2|checkAtAssignment|checkSlotAssignment|classesToAM|classLabel|classMetaName|className|coerce|Compare|completeClassDefinition|completeExtends|completeSubclasses|Complex|conformMethod|defaultDumpName|defaultPrototype|doPrimitiveMethod|dumpMethod|dumpMethods|el|elNamed|empty\\.dump|emptyMethodsList|evalOnLoad|evalqOnLoad|evalSource|existsFunction|existsMethod|extends|externalRefMethod|finalDefaultMethod|findClass|findFunction|findMethod|findMethods|findMethodSignatures|findUnique|fixPre1\\.8|formalArgs|functionBody|generic\\.skeleton|getAllSuperClasses|getClass|getClassDef|getClasses|getDataPart|getFunction|getGeneric|getGenerics|getGroup|getGroupMembers|getLoadActions|getMethod|getMethods|getMethodsForDispatch|getMethodsMetaData|getPackageName|getRefClass|getSlots|getValidity|hasArg|hasLoadAction|hasMethod|hasMethods|implicitGeneric|inheritedSlotNames|initFieldArgs|initialize|initRefFields|insertClassMethods|insertMethod|insertSource|is|isClass|isClassDef|isClassUnion|isGeneric|isGrammarSymbol|isGroup|isRematched|isSealedClass|isSealedMethod|isVirtualClass|isXS3Class|kronecker|languageEl|linearizeMlist|listFromMethods|listFromMlist|loadMethod|Logic|makeClassRepresentation|makeExtends|makeGeneric|makeMethodsList|makePrototypeFromClassDef|makeStandardGeneric|matchSignature|Math|Math2|mergeMethods|metaNameUndo|MethodAddCoerce|methodSignatureMatrix|method\\.skeleton|MethodsList|MethodsListSelect|methodsPackageMetaName|missingArg|multipleClasses|new|newBasic|newClassRepresentation|newEmptyObject|Ops|packageSlot|possibleExtends|prohibitGeneric|promptClass|promptMethods|prototype|Quote|rbind2|reconcilePropertiesAndPrototype|registerImplicitGenerics|rematchDefinition|removeClass|removeGeneric|removeMethod|removeMethods|representation|requireMethods|resetClass|resetGeneric|S3Class|S3Part|sealClass|selectMethod|selectSuperClasses|setAs|setClass|setClassUnion|setDataPart|setGeneric|setGenericImplicit|setGroupGeneric|setIs|setLoadAction|setLoadActions|setMethod|setOldClass|setPackageName|setPrimitiveMethods|setRefClass|setReplaceMethod|setValidity|show|showClass|showDefault|showExtends|showMethods|showMlist|signature|SignatureMethod|sigToEnv|slot|slotNames|slotsFromS3|substituteDirect|substituteFunctionArgs|Summary|superClassDepth|testInheritedMethods|testVirtual|tryNew|unRematchDefinition|validObject|validSlotNames)\\s*(\\()", - "captures": { - "1": { - "name": "support.function.r" + "name": "string.quoted.single.raw.r", + "begin": "[rR]'(-*)\\{", + "beginCaptures": { + "0": { + "name": "punctuation.definition.string.raw.begin.r" + } + }, + "end": "\\}\\1'", + "endCaptures": { + "0": { + "name": "punctuation.definition.string.raw.end.r" } } }, { - "match": "\\b(acf|acf2AR|add1|addmargins|add\\.scope|aggregate|aggregate\\.data\\.frame|aggregate\\.ts|AIC|alias|anova|ansari\\.test|aov|approx|approxfun|ar|ar\\.burg|arima|arima0|arima0\\.diag|arima\\.sim|ARMAacf|ARMAtoMA|ar\\.mle|ar\\.ols|ar\\.yw|as\\.dendrogram|as\\.dist|as\\.formula|as\\.hclust|asOneSidedFormula|as\\.stepfun|as\\.ts|ave|bandwidth\\.kernel|bartlett\\.test|BIC|binomial|binom\\.test|biplot|Box\\.test|bw\\.bcv|bw\\.nrd|bw\\.nrd0|bw\\.SJ|bw\\.ucv|C|cancor|case\\.names|ccf|chisq\\.test|cmdscale|coef|coefficients|complete\\.cases|confint|confint\\.default|confint\\.lm|constrOptim|contrasts|contr\\.helmert|contr\\.poly|contr\\.SAS|contr\\.sum|contr\\.treatment|convolve|cooks\\.distance|cophenetic|cor|cor\\.test|cov|cov2cor|covratio|cov\\.wt|cpgram|cutree|cycle|D|dbeta|dbinom|dcauchy|dchisq|decompose|delete\\.response|deltat|dendrapply|density|density\\.default|deriv|deriv3|deviance|dexp|df|DF2formula|dfbeta|dfbetas|dffits|df\\.kernel|df\\.residual|dgamma|dgeom|dhyper|diffinv|dist|dlnorm|dlogis|dmultinom|dnbinom|dnorm|dpois|drop1|drop\\.scope|drop\\.terms|dsignrank|dt|dummy\\.coef|dummy\\.coef\\.lm|dunif|dweibull|dwilcox|ecdf|eff\\.aovlist|effects|embed|end|estVar|expand\\.model\\.frame|extractAIC|factanal|factor\\.scope|family|fft|filter|fisher\\.test|fitted|fitted\\.values|fivenum|fligner\\.test|formula|frequency|friedman\\.test|ftable|Gamma|gaussian|get_all_vars|getCall|getInitial|glm|glm\\.control|glm\\.fit|hasTsp|hat|hatvalues|hclust|heatmap|HoltWinters|influence|influence\\.measures|integrate|interaction\\.plot|inverse\\.gaussian|IQR|is\\.empty\\.model|is\\.leaf|is\\.mts|isoreg|is\\.stepfun|is\\.ts|is\\.tskernel|KalmanForecast|KalmanLike|KalmanRun|KalmanSmooth|kernapply|kernel|kmeans|knots|kruskal\\.test|ksmooth|ks\\.test|lag|lag\\.plot|line|lm|lm\\.fit|lm\\.influence|lm\\.wfit|loadings|loess|loess\\.control|loess\\.smooth|logLik|loglin|lowess|ls\\.diag|lsfit|ls\\.print|mad|mahalanobis|makeARIMA|make\\.link|makepredictcall|manova|mantelhaen\\.test|mauchly\\.test|mcnemar\\.test|median|median\\.default|medpolish|model\\.extract|model\\.frame|model\\.frame\\.default|model\\.matrix|model\\.matrix\\.default|model\\.matrix\\.lm|model\\.offset|model\\.response|model\\.tables|model\\.weights|monthplot|mood\\.test|mvfft|na\\.action|na\\.contiguous|na\\.exclude|na\\.fail|na\\.omit|na\\.pass|napredict|naprint|naresid|nextn|nlm|nlminb|nls|nls\\.control|NLSstAsymptotic|NLSstClosestX|NLSstLfAsymptote|NLSstRtAsymptote|nobs|numericDeriv|offset|oneway\\.test|optim|optimHess|optimise|optimize|order\\.dendrogram|pacf|p\\.adjust|p\\.adjust\\.methods|Pair|pairwise\\.prop\\.test|pairwise\\.table|pairwise\\.t\\.test|pairwise\\.wilcox\\.test|pbeta|pbinom|pbirthday|pcauchy|pchisq|pexp|pf|pgamma|pgeom|phyper|plclust|plnorm|plogis|plot\\.ecdf|plot\\.spec\\.coherency|plot\\.spec\\.phase|plot\\.stepfun|plot\\.ts|pnbinom|pnorm|poisson|poisson\\.test|poly|polym|power|power\\.anova\\.test|power\\.prop\\.test|power\\.t\\.test|ppoints|ppois|ppr|PP\\.test|prcomp|predict|predict\\.glm|predict\\.lm|preplot|princomp|printCoefmat|profile|proj|promax|prop\\.test|prop\\.trend\\.test|psignrank|pt|ptukey|punif|pweibull|pwilcox|qbeta|qbinom|qbirthday|qcauchy|qchisq|qexp|qf|qgamma|qgeom|qhyper|qlnorm|qlogis|qnbinom|qnorm|qpois|qqline|qqnorm|qqplot|qsignrank|qt|qtukey|quade\\.test|quantile|quasi|quasibinomial|quasipoisson|qunif|qweibull|qwilcox|r2dtable|rbeta|rbinom|rcauchy|rchisq|read\\.ftable|rect\\.hclust|reformulate|relevel|reorder|replications|reshape|resid|residuals|residuals\\.glm|residuals\\.lm|rexp|rf|rgamma|rgeom|rhyper|rlnorm|rlogis|rmultinom|rnbinom|rnorm|rpois|rsignrank|rstandard|rstudent|rt|runif|runmed|rweibull|rwilcox|rWishart|scatter\\.smooth|screeplot|sd|se\\.contrast|selfStart|setNames|shapiro\\.test|sigma|simulate|smooth|smoothEnds|smooth\\.spline|sortedXyData|spec\\.ar|spec\\.pgram|spec\\.taper|spectrum|spline|splinefun|splinefunH|SSasymp|SSasympOff|SSasympOrig|SSbiexp|SSD|SSfol|SSfpl|SSgompertz|SSlogis|SSmicmen|SSweibull|start|stat\\.anova|step|stepfun|stl|StructTS|summary\\.aov|summary\\.glm|summary\\.lm|summary\\.manova|summary\\.stepfun|supsmu|symnum|termplot|terms|terms\\.formula|time|toeplitz|ts|tsdiag|ts\\.intersect|tsp|ts\\.plot|tsSmooth|ts\\.union|t\\.test|TukeyHSD|uniroot|update|update\\.default|update\\.formula|var|variable\\.names|varimax|var\\.test|vcov|weighted\\.mean|weighted\\.residuals|weights|wilcox\\.test|window|write\\.ftable|xtabs)\\s*(\\()", - "captures": { - "1": { - "name": "support.function.r" + "name": "string.quoted.double.raw.r", + "begin": "[rR]\"(-*)\\(", + "beginCaptures": { + "0": { + "name": "punctuation.definition.string.raw.begin.r" + } + }, + "end": "\\)\\1\"", + "endCaptures": { + "0": { + "name": "punctuation.definition.string.raw.end.r" } } }, { - "match": "\\b(adist|alarm|apropos|aregexec|argsAnywhere|asDateBuilt|askYesNo|aspell|aspell_package_C_files|aspell_package_Rd_files|aspell_package_R_files|aspell_package_vignettes|aspell_write_personal_dictionary_file|as\\.person|as\\.personList|as\\.relistable|as\\.roman|assignInMyNamespace|assignInNamespace|available\\.packages|bibentry|browseEnv|browseURL|browseVignettes|bug\\.report|capture\\.output|changedFiles|charClass|checkCRAN|chooseBioCmirror|chooseCRANmirror|citation|cite|citeNatbib|citEntry|citFooter|citHeader|close\\.socket|combn|compareVersion|contrib\\.url|count\\.fields|create\\.post|data|dataentry|data\\.entry|de|debugcall|debugger|demo|de\\.ncols|de\\.restore|de\\.setup|download\\.file|download\\.packages|dump\\.frames|edit|emacs|example|file\\.edit|fileSnapshot|file_test|find|findLineNum|fix|fixInNamespace|flush\\.console|formatOL|formatUL|getAnywhere|getCRANmirrors|getFromNamespace|getParseData|getParseText|getS3method|getSrcDirectory|getSrcFilename|getSrcLocation|getSrcref|getTxtProgressBar|glob2rx|globalVariables|hasName|head|head\\.matrix|help|help\\.request|help\\.search|help\\.start|history|hsearch_db|hsearch_db_concepts|hsearch_db_keywords|installed\\.packages|install\\.packages|is\\.relistable|isS3method|isS3stdGeneric|limitedLabels|loadhistory|localeToCharset|lsf\\.str|ls\\.str|maintainer|make\\.packages\\.html|makeRweaveLatexCodeRunner|make\\.socket|memory\\.limit|memory\\.size|menu|methods|mirror2html|modifyList|new\\.packages|news|nsl|object\\.size|old\\.packages|osVersion|packageDate|packageDescription|packageName|package\\.skeleton|packageStatus|packageVersion|page|person|personList|pico|process\\.events|prompt|promptData|promptImport|promptPackage|rc\\.getOption|rc\\.options|rc\\.settings|rc\\.status|readCitationFile|read\\.csv|read\\.csv2|read\\.delim|read\\.delim2|read\\.DIF|read\\.fortran|read\\.fwf|read\\.socket|read\\.table|recover|relist|remove\\.packages|removeSource|Rprof|Rprofmem|RShowDoc|RSiteSearch|rtags|Rtangle|RtangleFinish|RtangleRuncode|RtangleSetup|RtangleWritedoc|RweaveChunkPrefix|RweaveEvalWithOpt|RweaveLatex|RweaveLatexFinish|RweaveLatexOptions|RweaveLatexSetup|RweaveLatexWritedoc|RweaveTryStop|savehistory|select\\.list|sessionInfo|setBreakpoint|setRepositories|setTxtProgressBar|stack|Stangle|str|strcapture|strOptions|summaryRprof|suppressForeignCheck|Sweave|SweaveHooks|SweaveSyntaxLatex|SweaveSyntaxNoweb|SweaveSyntConv|tail|tail\\.matrix|tar|timestamp|toBibtex|toLatex|txtProgressBar|type\\.convert|undebugcall|unstack|untar|unzip|update\\.packages|upgrade|URLdecode|URLencode|url\\.show|vi|View|vignette|warnErrList|write\\.csv|write\\.csv2|write\\.socket|write\\.table|xedit|xemacs|zip)\\s*(\\()", - "captures": { - "1": { - "name": "support.function.r" + "name": "string.quoted.single.raw.r", + "begin": "[rR]'(-*)\\(", + "beginCaptures": { + "0": { + "name": "punctuation.definition.string.raw.begin.r" + } + }, + "end": "\\)\\1'", + "endCaptures": { + "0": { + "name": "punctuation.definition.string.raw.end.r" } } + }, + { + "name": "string.quoted.double.r", + "begin": "\"", + "beginCaptures": { + "0": { + "name": "punctuation.definition.string.begin.r" + } + }, + "end": "\"", + "endCaptures": { + "0": { + "name": "punctuation.definition.string.end.r" + } + }, + "patterns": [ + { + "name": "constant.character.escape.r", + "match": "\\\\." + } + ] + }, + { + "name": "string.quoted.single.r", + "begin": "'", + "beginCaptures": { + "0": { + "name": "punctuation.definition.string.begin.r" + } + }, + "end": "'", + "endCaptures": { + "0": { + "name": "punctuation.definition.string.end.r" + } + }, + "patterns": [ + { + "match": "\\\\.", + "name": "constant.character.escape.r" + } + ] } ] } diff --git a/org.eclipse.tm4e.language_pack/syntaxes/razor/razor.tmLanguage.json b/org.eclipse.tm4e.language_pack/syntaxes/razor/razor.tmLanguage.json index 27f953ea4..286005474 100644 --- a/org.eclipse.tm4e.language_pack/syntaxes/razor/razor.tmLanguage.json +++ b/org.eclipse.tm4e.language_pack/syntaxes/razor/razor.tmLanguage.json @@ -34,7 +34,7 @@ "include": "#razor-control-structures" }, { - "include": "text.html.basic" + "include": "text.html.derivative" } ], "repository": { @@ -155,7 +155,7 @@ "include": "#razor-control-structures" }, { - "include": "text.html.basic" + "include": "text.html.derivative" } ] } @@ -239,7 +239,7 @@ }, "patterns": [ { - "include": "text.html.basic#attribute" + "include": "text.html.derivative" } ], "end": "/?>", @@ -286,7 +286,7 @@ "include": "#razor-control-structures" }, { - "include": "text.html.basic#attribute" + "include": "text.html.derivative" } ] }, diff --git a/org.eclipse.tm4e.language_pack/syntaxes/ruby/ruby.tmLanguage.json b/org.eclipse.tm4e.language_pack/syntaxes/ruby/ruby.tmLanguage.json index 84fb37228..21e8df8ab 100644 --- a/org.eclipse.tm4e.language_pack/syntaxes/ruby/ruby.tmLanguage.json +++ b/org.eclipse.tm4e.language_pack/syntaxes/ruby/ruby.tmLanguage.json @@ -4,7 +4,7 @@ "If you want to provide a fix or improvement, please create a pull request against the original repository.", "Once accepted there, we are happy to receive an update request." ], - "version": "https://github.com/Shopify/ruby-lsp/commit/01a8ecf608b7d8607adcd89c32db72ae3852f33b", + "version": "https://github.com/Shopify/ruby-lsp/commit/2d5552a22f71ac75086c7f03d404df51e23f6535", "name": "Ruby", "scopeName": "source.ruby", "patterns": [ @@ -30,7 +30,7 @@ } }, "comment": "class Namespace::ClassName < OtherNamespace::OtherClassName", - "match": "\b(class)\\s+(([a-zA-Z0-9_]+)((::)[a-zA-Z0-9_]+)*)\\s*((<)\\s*(([a-zA-Z0-9_]+)((::)[a-zA-Z0-9_]+)*))?", + "match": "\\b(class)\\s+(([a-zA-Z0-9_]+)((::)[a-zA-Z0-9_]+)*)\\s*((<)\\s*(([a-zA-Z0-9_]+)((::)[a-zA-Z0-9_]+)*))?", "name": "meta.class.ruby" }, { @@ -45,7 +45,7 @@ "name": "punctuation.separator.namespace.ruby" } }, - "match": "\b(module)\\s+(([a-zA-Z0-9_]+)((::)[a-zA-Z0-9_]+)*)", + "match": "\\b(module)\\s+(([a-zA-Z0-9_]+)((::)[a-zA-Z0-9_]+)*)", "name": "meta.module.ruby" }, { @@ -57,7 +57,7 @@ "name": "punctuation.separator.inheritance.ruby" } }, - "match": "\b(class)\\s*(<<)\\s*", + "match": "\\b(class)\\s*(<<)\\s*", "name": "meta.class.ruby" }, { @@ -70,11 +70,11 @@ "1": { "name": "variable.ruby" }, - "3": { + "2": { "name": "keyword.operator.assignment.augmented.ruby" } }, - "match": "^\\s*([a-z]([A-Za-z0-9_])*)\\s*((&&|\\|\\|)=)", + "match": "^\\s*([_a-z][A-Za-z0-9_]*)\\s*((&&|\\|\\|)=)", "comment": "A local variable and/or assignment" }, { @@ -85,11 +85,11 @@ "3": { "name": "variable.ruby" }, - "5": { + "4": { "name": "keyword.operator.assignment.augmented.ruby" } }, - "match": "(?>)=)", + "match": "^\\s*([_a-z][A-Za-z0-9_]*)\\s*((\\+|\\*|-|\\/|%|\\*\\*|&|\\||\\^|<<|>>)=)", "comment": "A local variable operation assignment (+=, -=, *=, /=)" }, { @@ -112,11 +112,11 @@ "3": { "name": "variable.ruby" }, - "5": { + "4": { "name": "keyword.operator.assignment.augmented.ruby" } }, - "match": "(?>)=)", + "match": "(?>)=)", "comment": "A local variable operation assignment in a condition" }, { @@ -125,7 +125,7 @@ "name": "variable.ruby" } }, - "match": "^\\s*([a-z]([A-Za-z0-9_])*)\\s*=[^=>]", + "match": "^\\s*([_a-z][A-Za-z0-9_]*)\\s*(?==[^=>])", "comment": "A local variable assignment" }, { @@ -137,7 +137,7 @@ "name": "variable.ruby" } }, - "match": "(?]", + "match": "(?]", "comment": "A local variable assignment in a condition" }, { @@ -1590,17 +1590,16 @@ "begin": "(?><<[-~]([\"'`]?)((?:[_\\w]+_|)HTML)\\b\\1)", "beginCaptures": { "0": { - "name": "punctuation.definition.string.begin.ruby" + "name": "string.definition.begin.ruby" } }, "contentName": "text.html", "end": "^\\s*\\2$\\n?", "endCaptures": { "0": { - "name": "punctuation.definition.string.end.ruby" + "name": "string.definition.end.ruby" } }, - "name": "string.unquoted.heredoc.ruby", "patterns": [ { "include": "#heredoc" @@ -1628,17 +1627,16 @@ "begin": "(?><<[-~]([\"'`]?)((?:[_\\w]+_|)HAML)\\b\\1)", "beginCaptures": { "0": { - "name": "punctuation.definition.string.begin.ruby" + "name": "string.definition.begin.ruby" } }, "contentName": "text.haml", "end": "^\\s*\\2$\\n?", "endCaptures": { "0": { - "name": "punctuation.definition.string.end.ruby" + "name": "string.definition.end.ruby" } }, - "name": "string.unquoted.heredoc.ruby", "patterns": [ { "include": "#heredoc" @@ -1666,17 +1664,16 @@ "begin": "(?><<[-~]([\"'`]?)((?:[_\\w]+_|)XML)\\b\\1)", "beginCaptures": { "0": { - "name": "punctuation.definition.string.begin.ruby" + "name": "string.definition.begin.ruby" } }, "contentName": "text.xml", "end": "^\\s*\\2$\\n?", "endCaptures": { "0": { - "name": "punctuation.definition.string.end.ruby" + "name": "string.definition.end.ruby" } }, - "name": "string.unquoted.heredoc.ruby", "patterns": [ { "include": "#heredoc" @@ -1704,17 +1701,16 @@ "begin": "(?><<[-~]([\"'`]?)((?:[_\\w]+_|)SQL)\\b\\1)", "beginCaptures": { "0": { - "name": "punctuation.definition.string.begin.ruby" + "name": "string.definition.begin.ruby" } }, "contentName": "source.sql", "end": "^\\s*\\2$\\n?", "endCaptures": { "0": { - "name": "punctuation.definition.string.end.ruby" + "name": "string.definition.end.ruby" } }, - "name": "string.unquoted.heredoc.ruby", "patterns": [ { "include": "#heredoc" @@ -1742,17 +1738,16 @@ "begin": "(?><<[-~]([\"'`]?)((?:[_\\w]+_|)(?:GRAPHQL|GQL))\\b\\1)", "beginCaptures": { "0": { - "name": "punctuation.definition.string.begin.ruby" + "name": "string.definition.begin.ruby" } }, "contentName": "source.graphql", "end": "^\\s*\\2$\\n?", "endCaptures": { "0": { - "name": "punctuation.definition.string.end.ruby" + "name": "string.definition.end.ruby" } }, - "name": "string.unquoted.heredoc.ruby", "patterns": [ { "include": "#heredoc" @@ -1780,17 +1775,16 @@ "begin": "(?><<[-~]([\"'`]?)((?:[_\\w]+_|)CSS)\\b\\1)", "beginCaptures": { "0": { - "name": "punctuation.definition.string.begin.ruby" + "name": "string.definition.begin.ruby" } }, "contentName": "source.css", "end": "^\\s*\\2$\\n?", "endCaptures": { "0": { - "name": "punctuation.definition.string.end.ruby" + "name": "string.definition.end.ruby" } }, - "name": "string.unquoted.heredoc.ruby", "patterns": [ { "include": "#heredoc" @@ -1818,17 +1812,16 @@ "begin": "(?><<[-~]([\"'`]?)((?:[_\\w]+_|)CPP)\\b\\1)", "beginCaptures": { "0": { - "name": "punctuation.definition.string.begin.ruby" + "name": "string.definition.begin.ruby" } }, "contentName": "source.cpp", "end": "^\\s*\\2$\\n?", "endCaptures": { "0": { - "name": "punctuation.definition.string.end.ruby" + "name": "string.definition.end.ruby" } }, - "name": "string.unquoted.heredoc.ruby", "patterns": [ { "include": "#heredoc" @@ -1856,17 +1849,16 @@ "begin": "(?><<[-~]([\"'`]?)((?:[_\\w]+_|)C)\\b\\1)", "beginCaptures": { "0": { - "name": "punctuation.definition.string.begin.ruby" + "name": "string.definition.begin.ruby" } }, "contentName": "source.c", "end": "^\\s*\\2$\\n?", "endCaptures": { "0": { - "name": "punctuation.definition.string.end.ruby" + "name": "string.definition.end.ruby" } }, - "name": "string.unquoted.heredoc.ruby", "patterns": [ { "include": "#heredoc" @@ -1894,17 +1886,16 @@ "begin": "(?><<[-~]([\"'`]?)((?:[_\\w]+_|)(?:JS|JAVASCRIPT))\\b\\1)", "beginCaptures": { "0": { - "name": "punctuation.definition.string.begin.ruby" + "name": "string.definition.begin.ruby" } }, "contentName": "source.js", "end": "^\\s*\\2$\\n?", "endCaptures": { "0": { - "name": "punctuation.definition.string.end.ruby" + "name": "string.definition.end.ruby" } }, - "name": "string.unquoted.heredoc.ruby", "patterns": [ { "include": "#heredoc" @@ -1932,17 +1923,16 @@ "begin": "(?><<[-~]([\"'`]?)((?:[_\\w]+_|)JQUERY)\\b\\1)", "beginCaptures": { "0": { - "name": "punctuation.definition.string.begin.ruby" + "name": "string.definition.begin.ruby" } }, "contentName": "source.js.jquery", "end": "^\\s*\\2$\\n?", "endCaptures": { "0": { - "name": "punctuation.definition.string.end.ruby" + "name": "string.definition.end.ruby" } }, - "name": "string.unquoted.heredoc.ruby", "patterns": [ { "include": "#heredoc" @@ -1970,17 +1960,16 @@ "begin": "(?><<[-~]([\"'`]?)((?:[_\\w]+_|)(?:SH|SHELL))\\b\\1)", "beginCaptures": { "0": { - "name": "punctuation.definition.string.begin.ruby" + "name": "string.definition.begin.ruby" } }, "contentName": "source.shell", "end": "^\\s*\\2$\\n?", "endCaptures": { "0": { - "name": "punctuation.definition.string.end.ruby" + "name": "string.definition.end.ruby" } }, - "name": "string.unquoted.heredoc.ruby", "patterns": [ { "include": "#heredoc" @@ -2008,17 +1997,16 @@ "begin": "(?><<[-~]([\"'`]?)((?:[_\\w]+_|)LUA)\\b\\1)", "beginCaptures": { "0": { - "name": "punctuation.definition.string.begin.ruby" + "name": "string.definition.begin.ruby" } }, "contentName": "source.lua", "end": "^\\s*\\2$\\n?", "endCaptures": { "0": { - "name": "punctuation.definition.string.end.ruby" + "name": "string.definition.end.ruby" } }, - "name": "string.unquoted.heredoc.ruby", "patterns": [ { "include": "#heredoc" @@ -2046,17 +2034,16 @@ "begin": "(?><<[-~]([\"'`]?)((?:[_\\w]+_|)RUBY)\\b\\1)", "beginCaptures": { "0": { - "name": "punctuation.definition.string.begin.ruby" + "name": "string.definition.begin.ruby" } }, "contentName": "source.ruby", "end": "^\\s*\\2$\\n?", "endCaptures": { "0": { - "name": "punctuation.definition.string.end.ruby" + "name": "string.definition.end.ruby" } }, - "name": "string.unquoted.heredoc.ruby", "patterns": [ { "include": "#heredoc" @@ -2084,17 +2071,16 @@ "begin": "(?><<[-~]([\"'`]?)((?:[_\\w]+_|)(?:YAML|YML))\\b\\1)", "beginCaptures": { "0": { - "name": "punctuation.definition.string.begin.ruby" + "name": "string.definition.begin.ruby" } }, "contentName": "source.yaml", "end": "^\\s*\\2$\\n?", "endCaptures": { "0": { - "name": "punctuation.definition.string.end.ruby" + "name": "string.definition.end.ruby" } }, - "name": "string.unquoted.heredoc.ruby", "patterns": [ { "include": "#heredoc" @@ -2122,17 +2108,16 @@ "begin": "(?><<[-~]([\"'`]?)((?:[_\\w]+_|)SLIM)\\b\\1)", "beginCaptures": { "0": { - "name": "punctuation.definition.string.begin.ruby" + "name": "string.definition.begin.ruby" } }, "contentName": "text.slim", "end": "^\\s*\\2$\\n?", "endCaptures": { "0": { - "name": "punctuation.definition.string.end.ruby" + "name": "string.definition.end.ruby" } }, - "name": "string.unquoted.heredoc.ruby", "patterns": [ { "include": "#heredoc" @@ -2154,16 +2139,16 @@ "begin": "(?>=\\s*<<([\"'`]?)(\\w+)\\1)", "beginCaptures": { "0": { - "name": "punctuation.definition.string.begin.ruby" + "name": "string.definition.begin.ruby" } }, "end": "^\\2$", "endCaptures": { "0": { - "name": "punctuation.definition.string.end.ruby" + "name": "string.definition.end.ruby" } }, - "name": "string.unquoted.heredoc.ruby", + "contentName": "string.unquoted.heredoc.ruby", "patterns": [ { "include": "#heredoc" @@ -2180,7 +2165,7 @@ "begin": "(?>((<<[-~]([\"'`]?)(\\w+)\\3,\\s?)*<<[-~]([\"'`]?)(\\w+)\\5))(.*)", "beginCaptures": { "1": { - "name": "punctuation.definition.string.begin.ruby" + "name": "string.definition.begin.ruby" }, "7": { "patterns": [ @@ -2194,10 +2179,10 @@ "end": "^\\s*\\6$", "endCaptures": { "0": { - "name": "punctuation.definition.string.end.ruby" + "name": "string.definition.end.ruby" } }, - "name": "string.unquoted.heredoc.ruby", + "contentName": "string.unquoted.heredoc.ruby", "patterns": [ { "include": "#heredoc" @@ -2211,7 +2196,7 @@ ] }, { - "begin": "(?<={|{\\s|[^A-Za-z0-9_:@$]do|^do|[^A-Za-z0-9_:@$]do\\s|^do\\s)(\\|)", + "begin": "(?<={|{\\s+|[^A-Za-z0-9_:@$]do|^do|[^A-Za-z0-9_:@$]do\\s+|^do\\s+)(\\|)", "name": "meta.block.parameters.ruby", "captures": { "1": { @@ -2225,16 +2210,13 @@ "end": "(?=,|\\|\\s*)", "patterns": [ { - "match": "\\G([&*]?)([a-zA-Z][\\w_]*)|(_[\\w_]*)", + "match": "\\G((?:&|\\*\\*?)?)([a-zA-Z_][\\w_]*)", "captures": { "1": { "name": "storage.type.variable.ruby" }, "2": { "name": "variable.other.block.ruby" - }, - "3": { - "name": "variable.other.block.unused.ruby variable.other.constant.ruby" } } } diff --git a/org.eclipse.tm4e.language_pack/syntaxes/rust/rust.tmLanguage.json b/org.eclipse.tm4e.language_pack/syntaxes/rust/rust.tmLanguage.json index 16307e72a..5f871ae88 100644 --- a/org.eclipse.tm4e.language_pack/syntaxes/rust/rust.tmLanguage.json +++ b/org.eclipse.tm4e.language_pack/syntaxes/rust/rust.tmLanguage.json @@ -4,7 +4,7 @@ "If you want to provide a fix or improvement, please create a pull request against the original repository.", "Once accepted there, we are happy to receive an update request." ], - "version": "https://github.com/dustypomerleau/rust-syntax/commit/e90d3dbdb61b96e4afdce6f7a3572426b1a86d9d", + "version": "https://github.com/dustypomerleau/rust-syntax/commit/268fd42cfd4aa96a6ed9024a2850d17d6cd2dc7b", "name": "Rust", "scopeName": "source.rust", "patterns": [ @@ -52,7 +52,7 @@ { "comment": "macro type metavariables", "name": "meta.macro.metavariable.type.rust", - "match": "(\\$)((crate)|([A-Z][A-Za-z0-9_]*))((:)(block|expr|ident|item|lifetime|literal|meta|path?|stmt|tt|ty|vis))?", + "match": "(\\$)((crate)|([A-Z]\\w*))(\\s*(:)\\s*(block|expr(?:_2021)?|ident|item|lifetime|literal|meta|pat(?:_param)?|path|stmt|tt|ty|vis)\\b)?", "captures": { "1": { "name": "keyword.operator.macro.dollar.rust" @@ -79,7 +79,7 @@ { "comment": "macro metavariables", "name": "meta.macro.metavariable.rust", - "match": "(\\$)([a-z][A-Za-z0-9_]*)((:)(block|expr|ident|item|lifetime|literal|meta|path?|stmt|tt|ty|vis))?", + "match": "(\\$)([a-z]\\w*)(\\s*(:)\\s*(block|expr(?:_2021)?|ident|item|lifetime|literal|meta|pat(?:_param)?|path|stmt|tt|ty|vis)\\b)?", "captures": { "1": { "name": "keyword.operator.macro.dollar.rust" diff --git a/org.eclipse.tm4e.language_pack/syntaxes/sql/sql.tmLanguage.json b/org.eclipse.tm4e.language_pack/syntaxes/sql/sql.tmLanguage.json index 9db452210..d0eefc0c2 100644 --- a/org.eclipse.tm4e.language_pack/syntaxes/sql/sql.tmLanguage.json +++ b/org.eclipse.tm4e.language_pack/syntaxes/sql/sql.tmLanguage.json @@ -4,7 +4,7 @@ "If you want to provide a fix or improvement, please create a pull request against the original repository.", "Once accepted there, we are happy to receive an update request." ], - "version": "https://github.com/microsoft/vscode-mssql/commit/49eff02f68b6ee73025c6665c672ca1c93385dde", + "version": "https://github.com/microsoft/vscode-mssql/commit/ff0c7d3b3582100856fe5b839663b2a8704dc4e4", "name": "SQL", "scopeName": "source.sql", "patterns": [ @@ -127,7 +127,7 @@ "match": "(?xi)\n\n\t\t\t\t# normal stuff, capture 1\n\t\t\t\t \\b(bigint|bigserial|bit|boolean|box|bytea|cidr|circle|date|double\\sprecision|inet|int|integer|line|lseg|macaddr|money|oid|path|point|polygon|real|serial|smallint|sysdate|text)\\b\n\n\t\t\t\t# numeric suffix, capture 2 + 3i\n\t\t\t\t|\\b(bit\\svarying|character\\s(?:varying)?|tinyint|var\\schar|float|interval)\\((\\d+)\\)\n\n\t\t\t\t# optional numeric suffix, capture 4 + 5i\n\t\t\t\t|\\b(char|number|varchar\\d?)\\b(?:\\((\\d+)\\))?\n\n\t\t\t\t# special case, capture 6 + 7i + 8i\n\t\t\t\t|\\b(numeric|decimal)\\b(?:\\((\\d+),(\\d+)\\))?\n\n\t\t\t\t# special case, captures 9, 10i, 11\n\t\t\t\t|\\b(times?)\\b(?:\\((\\d+)\\))?(\\swith(?:out)?\\stime\\szone\\b)?\n\n\t\t\t\t# special case, captures 12, 13, 14i, 15\n\t\t\t\t|\\b(timestamp)(?:(s|tz))?\\b(?:\\((\\d+)\\))?(\\s(with|without)\\stime\\szone\\b)?\n\n\t\t\t" }, { - "match": "(?i:\\b((?:primary|foreign)\\s+key|references|on\\sdelete(\\s+cascade)?|nocheck|check|constraint|collate|default)\\b)", + "match": "(?i:\\b((?:primary|foreign)\\s+key|references|on\\s+(delete|update)(\\s+cascade)?|nocheck|check|constraint|collate|default)\\b)", "name": "storage.modifier.sql" }, { @@ -159,7 +159,7 @@ "name": "keyword.other.data-integrity.sql" }, { - "match": "(?i:^\\s*(comment\\s+on\\s+(table|column|aggregate|constraint|database|domain|function|index|operator|rule|schema|sequence|trigger|type|view))\\s+.*?\\s+(is)\\s+)", + "match": "(?i:^\\s*(comment\\s+on\\s+(table|column|aggregate|constraint|database|domain|function|index|operator|rule|schema|sequence|trigger|type|view))\\s+)", "name": "keyword.other.object-comments.sql" }, { @@ -354,6 +354,14 @@ } } }, + { + "match": "(?i)\\b(vector_distance|vector_norm|vector_normalize)\\b\\s*\\(", + "captures": { + "1": { + "name": "support.function.vector.sql" + } + } + }, { "captures": { "1": { @@ -372,7 +380,7 @@ "include": "#regexps" }, { - "match": "\\b(?i)(abort|abort_after_wait|absent|absolute|accent_sensitivity|acceptable_cursopt|acp|action|activation|add|address|admin|aes_128|aes_192|aes_256|affinity|after|aggregate|algorithm|all_constraints|all_errormsgs|all_indexes|all_levels|all_results|allow_connections|allow_dup_row|allow_encrypted_value_modifications|allow_page_locks|allow_row_locks|allow_snapshot_isolation|alter|altercolumn|always|anonymous|ansi_defaults|ansi_null_default|ansi_null_dflt_off|ansi_null_dflt_on|ansi_nulls|ansi_padding|ansi_warnings|appdomain|append|application|apply|arithabort|arithignore|array|assembly|asymmetric|asynchronous_commit|at|atan2|atomic|attach|attach_force_rebuild_log|attach_rebuild_log|audit|auth_realm|authentication|auto|auto_cleanup|auto_close|auto_create_statistics|auto_drop|auto_shrink|auto_update_statistics|auto_update_statistics_async|automated_backup_preference|automatic|autopilot|availability|availability_mode|backup|backup_priority|base64|basic|batches|batchsize|before|between|bigint|binary|binding|bit|block|blockers|blocksize|bmk|both|break|broker|broker_instance|bucket_count|buffer|buffercount|bulk_logged|by|call|caller|card|case|catalog|catch|cert|certificate|change_retention|change_tracking|change_tracking_context|changes|char|character|character_set|check_expiration|check_policy|checkconstraints|checkindex|checkpoint|checksum|cleanup_policy|clear|clear_port|close|clustered|codepage|collection|column_encryption_key|column_master_key|columnstore|columnstore_archive|colv_80_to_100|colv_100_to_80|commit_differential_base|committed|compatibility_level|compress_all_row_groups|compression|compression_delay|concat_null_yields_null|concatenate|configuration|connect|connection|containment|continue|continue_after_error|contract|contract_name|control|conversation|conversation_group_id|conversation_handle|copy|copy_only|count_rows|counter|create(\\\\s+or\\\\s+alter)?|credential|cross|cryptographic|cryptographic_provider|cube|cursor|cursor_close_on_commit|cursor_default|data|data_compression|data_flush_interval_seconds|data_mirroring|data_purity|data_source|database|database_name|database_snapshot|datafiletype|date_correlation_optimization|date|datefirst|dateformat|date_format|datetime|datetime2|datetimeoffset|day(s)?|db_chaining|dbid|dbidexec|dbo_only|deadlock_priority|deallocate|dec|decimal|declare|decrypt|decrypt_a|decryption|default_database|default_fulltext_language|default_language|default_logon_domain|default_schema|definition|delay|delayed_durability|delimitedtext|density_vector|dependent|des|description|desired_state|desx|differential|digest|disable|disable_broker|disable_def_cnst_chk|disabled|disk|distinct|distributed|distribution|drop|drop_existing|dts_buffers|dump|durability|dynamic|edition|elements|else|emergency|empty|enable|enable_broker|enabled|encoding|encrypted|encrypted_value|encryption|encryption_type|end|endpoint|endpoint_url|enhancedintegrity|entry|error_broker_conversations|errorfile|estimateonly|event|except|exec|executable|execute|exists|expand|expiredate|expiry_date|explicit|external|external_access|failover|failover_mode|failure_condition_level|fast|fast_forward|fastfirstrow|federated_service_account|fetch|field_terminator|fieldterminator|file|filelistonly|filegroup|filegrowth|filename|filestream|filestream_log|filestream_on|filetable|file_format|filter|first_row|fips_flagger|fire_triggers|first|firstrow|float|flush_interval_seconds|fmtonly|following|for|force|force_failover_allow_data_loss|force_service_allow_data_loss|forced|forceplan|formatfile|format_options|format_type|formsof|forward_only|free_cursors|free_exec_context|fullscan|fulltext|fulltextall|fulltextkey|function|generated|get|geography|geometry|global|go|goto|governor|guid|hadoop|hardening|hash|hashed|header_limit|headeronly|health_check_timeout|hidden|hierarchyid|histogram|histogram_steps|hits_cursors|hits_exec_context|hour(s)?|http|identity|identity_value|if|ifnull|ignore|ignore_constraints|ignore_dup_key|ignore_dup_row|ignore_triggers|image|immediate|implicit_transactions|include|include_null_values|incremental|index|inflectional|init|initiator|insensitive|insert|instead|int|integer|integrated|intersect|intermediate|interval_length_minutes|into|inuse_cursors|inuse_exec_context|io|is|isabout|iso_week|isolation|job_tracker_location|json|keep|keep_nulls|keep_replication|keepdefaults|keepfixed|keepidentity|keepnulls|kerberos|key|key_path|key_source|key_store_provider_name|keyset|kill|kilobytes_per_batch|labelonly|langid|language|last|lastrow|leading|legacy_cardinality_estimation|length|level|lifetime|lineage_80_to_100|lineage_100_to_80|listener_ip|listener_port|load|loadhistory|lob_compaction|local|local_service_name|locate|location|lock_escalation|lock_timeout|lockres|log|login|login_type|loop|manual|mark_in_use_for_removal|masked|master|match|matched|max_queue_readers|max_duration|max_outstanding_io_per_volume|maxdop|maxerrors|maxlength|maxtransfersize|max_plans_per_query|max_storage_size_mb|mediadescription|medianame|mediapassword|memogroup|memory_optimized|merge|message|message_forward_size|message_forwarding|microsecond|millisecond|minute(s)?|mirror_address|misses_cursors|misses_exec_context|mixed|modify|money|month|move|multi_user|must_change|name|namespace|nanosecond|native|native_compilation|nchar|ncharacter|nested_triggers|never|new_account|new_broker|newname|next|no|no_browsetable|no_checksum|no_compression|no_infomsgs|no_triggers|no_truncate|nocount|noexec|noexpand|noformat|noinit|nolock|nonatomic|nonclustered|nondurable|none|norecompute|norecovery|noreset|norewind|noskip|not|notification|nounload|now|nowait|ntext|ntlm|nulls|numeric|numeric_roundabort|nvarchar|object|objid|oem|offline|old_account|online|operation_mode|open|openjson|optimistic|option|orc|out|outer|output|over|override|owner|ownership|pad_index|page|page_checksum|page_verify|pagecount|paglock|param|parameter_sniffing|parameter_type_expansion|parameterization|parquet|parseonly|partial|partition|partner|password|path|pause|percentage|permission_set|persisted|period|physical_only|plan_forcing_mode|policy|pool|population|ports|preceding|precision|predicate|presume_abort|primary|primary_role|print|prior|priority |priority_level|private|proc(edure)?|procedure_name|profile|provider|quarter|query_capture_mode|query_governor_cost_limit|query_optimizer_hotfixes|query_store|queue|quoted_identifier|raiserror|range|raw|rcfile|rc2|rc4|rc4_128|rdbms|read_committed_snapshot|read|read_only|read_write|readcommitted|readcommittedlock|readonly|readpast|readuncommitted|readwrite|real|rebuild|receive|recmodel_70backcomp|recompile|reconfigure|recovery|recursive|recursive_triggers|redo_queue|reject_sample_value|reject_type|reject_value|relative|remote|remote_data_archive|remote_proc_transactions|remote_service_name|remove|removed_cursors|removed_exec_context|reorganize|repeat|repeatable|repeatableread|replace|replica|replicated|replnick_100_to_80|replnickarray_80_to_100|replnickarray_100_to_80|required|required_cursopt|resample|reset|resource|resource_manager_location|respect|restart|restore|restricted_user|resume|retaindays|retention|return|revert|rewind|rewindonly|returns|robust|role|rollup|root|round_robin|route|row|rowdump|rowguidcol|rowlock|row_terminator|rows|rows_per_batch|rowsets_only|rowterminator|rowversion|rsa_1024|rsa_2048|rsa_3072|rsa_4096|rsa_512|safe|safety|sample|save|scalar|schema|schemabinding|scoped|scroll|scroll_locks|sddl|second|secexpr|seconds|secondary|secondary_only|secondary_role|secret|security|securityaudit|selective|self|send|sent|sequence|serde_method|serializable|server|service|service_broker|service_name|service_objective|session_timeout|session|sessions|seterror|setopts|sets|shard_map_manager|shard_map_name|sharded|shared_memory|shortest_path|show_statistics|showplan_all|showplan_text|showplan_xml|showplan_xml_with_recompile|shrinkdb|shutdown|sid|signature|simple|single_blob|single_clob|single_nclob|single_user|singleton|site|size|size_based_cleanup_mode|skip|smalldatetime|smallint|smallmoney|snapshot|snapshot_import|snapshotrestorephase|soap|softnuma|sort_in_tempdb|sorted_data|sorted_data_reorg|spatial|sql|sql_bigint|sql_binary|sql_bit|sql_char|sql_date|sql_decimal|sql_double|sql_float|sql_guid|sql_handle|sql_longvarbinary|sql_longvarchar|sql_numeric|sql_real|sql_smallint|sql_time|sql_timestamp|sql_tinyint|sql_tsi_day|sql_tsi_frac_second|sql_tsi_hour|sql_tsi_minute|sql_tsi_month|sql_tsi_quarter|sql_tsi_second|sql_tsi_week|sql_tsi_year|sql_type_date|sql_type_time|sql_type_timestamp|sql_varbinary|sql_varchar|sql_variant|sql_wchar|sql_wlongvarchar|ssl|ssl_port|standard|standby|start|start_date|started|stat_header|state|statement|static|statistics|statistics_incremental|statistics_norecompute|statistics_only|statman|stats|stats_stream|status|stop|stop_on_error|stopat|stopatmark|stopbeforemark|stoplist|stopped|string_delimiter|subject|supplemental_logging|supported|suspend|symmetric|synchronous_commit|synonym|sysname|system|system_time|system_versioning|table|tableresults|tablock|tablockx|take|tape|target|target_index|target_partition|target_recovery_time|tcp|temporal_history_retention|text|textimage_on|then|thesaurus|throw|time|timeout|timestamp|tinyint|to|top|torn_page_detection|track_columns_updated|trailing|tran|transaction|transfer|transform_noise_words|triple_des|triple_des_3key|truncate|trustworthy|try|tsql|two_digit_year_cutoff|type|type_desc|type_warning|tzoffset|uid|unbounded|uncommitted|unique|uniqueidentifier|unlimited|unload|unlock|unsafe|updlock|url|use|useplan|useroptions|use_type_default|using|utcdatetime|valid_xml|validation|value|values|varbinary|varchar|verbose|verifyonly|version|view_metadata|virtual_device|visiblity|wait_at_low_priority|waitfor|webmethod|week|weekday|weight|well_formed_xml|when|while|widechar|widechar_ansi|widenative|window|windows|with|within|within group|witness|without|without_array_wrapper|workload|wsdl|xact_abort|xlock|xml|xmlschema|xquery|xsinil|year|zone)\\b", + "match": "\\b(?i)(abort|abort_after_wait|absent|absolute|accent_sensitivity|acceptable_cursopt|acp|action|activation|add|address|admin|aes_128|aes_192|aes_256|affinity|after|aggregate|algorithm|all_constraints|all_errormsgs|all_indexes|all_levels|all_results|allow_connections|allow_dup_row|allow_encrypted_value_modifications|allow_page_locks|allow_row_locks|allow_snapshot_isolation|alter|altercolumn|always|anonymous|ansi_defaults|ansi_null_default|ansi_null_dflt_off|ansi_null_dflt_on|ansi_nulls|ansi_padding|ansi_warnings|appdomain|append|application|apply|arithabort|arithignore|array|assembly|asymmetric|asynchronous_commit|at|atan2|atomic|attach|attach_force_rebuild_log|attach_rebuild_log|audit|auth_realm|authentication|auto|auto_cleanup|auto_close|auto_create_statistics|auto_drop|auto_shrink|auto_update_statistics|auto_update_statistics_async|automated_backup_preference|automatic|autopilot|availability|availability_mode|backup|backup_priority|base64|basic|batches|batchsize|before|between|bigint|binary|binding|bit|block|blockers|blocksize|bmk|both|break|broker|broker_instance|bucket_count|buffer|buffercount|bulk_logged|by|call|caller|card|case|catalog|catch|cert|certificate|change_retention|change_tracking|change_tracking_context|changes|char|character|character_set|check_expiration|check_policy|checkconstraints|checkindex|checkpoint|checksum|cleanup_policy|clear|clear_port|close|clustered|codepage|collection|column_encryption_key|column_master_key|columnstore|columnstore_archive|colv_80_to_100|colv_100_to_80|commit_differential_base|committed|compatibility_level|compress_all_row_groups|compression|compression_delay|concat_null_yields_null|concatenate|configuration|connect|connection|containment|continue|continue_after_error|contract|contract_name|control|conversation|conversation_group_id|conversation_handle|copy|copy_only|count_rows|counter|create(\\\\s+or\\\\s+alter)?|credential|cross|cryptographic|cryptographic_provider|cube|cursor|cursor_close_on_commit|cursor_default|data|data_compression|data_flush_interval_seconds|data_mirroring|data_purity|data_source|database|database_name|database_snapshot|datafiletype|date_correlation_optimization|date|datefirst|dateformat|date_format|datetime|datetime2|datetimeoffset|day(s)?|db_chaining|dbid|dbidexec|dbo_only|deadlock_priority|deallocate|dec|decimal|declare|decrypt|decrypt_a|decryption|default_database|default_fulltext_language|default_language|default_logon_domain|default_schema|definition|delay|delayed_durability|delimitedtext|density_vector|dependent|des|description|desired_state|desx|differential|digest|disable|disable_broker|disable_def_cnst_chk|disabled|disk|distinct|distributed|distribution|drop|drop_existing|dts_buffers|dump|durability|dynamic|edition|elements|else|emergency|empty|enable|enable_broker|enabled|encoding|encrypted|encrypted_value|encryption|encryption_type|end|endpoint|endpoint_url|enhancedintegrity|entry|error_broker_conversations|errorfile|estimateonly|event|except|exec|executable|execute|exists|expand|expiredate|expiry_date|explicit|external|external_access|failover|failover_mode|failure_condition_level|fast|fast_forward|fastfirstrow|federated_service_account|fetch|field_terminator|fieldterminator|file|filelistonly|filegroup|filegrowth|filename|filestream|filestream_log|filestream_on|filetable|file_format|filter|first_row|fips_flagger|fire_triggers|first|firstrow|float|flush_interval_seconds|fmtonly|following|for|force|force_failover_allow_data_loss|force_service_allow_data_loss|forced|forceplan|formatfile|format_options|format_type|formsof|forward_only|free_cursors|free_exec_context|fullscan|fulltext|fulltextall|fulltextkey|function|generated|get|geography|geometry|global|go|goto|governor|guid|hadoop|hardening|hash|hashed|header_limit|headeronly|health_check_timeout|hidden|hierarchyid|histogram|histogram_steps|hits_cursors|hits_exec_context|hour(s)?|http|identity|identity_value|if|ifnull|ignore|ignore_constraints|ignore_dup_key|ignore_dup_row|ignore_triggers|image|immediate|implicit_transactions|include|include_null_values|incremental|index|inflectional|init|initiator|insensitive|insert|instead|int|integer|integrated|intersect|intermediate|interval_length_minutes|into|inuse_cursors|inuse_exec_context|io|is|isabout|iso_week|isolation|job_tracker_location|json|keep|keep_nulls|keep_replication|keepdefaults|keepfixed|keepidentity|keepnulls|kerberos|key|key_path|key_source|key_store_provider_name|keyset|kill|kilobytes_per_batch|labelonly|langid|language|last|lastrow|leading|legacy_cardinality_estimation|length|level|lifetime|lineage_80_to_100|lineage_100_to_80|listener_ip|listener_port|load|loadhistory|lob_compaction|local|local_service_name|locate|location|lock_escalation|lock_timeout|lockres|log|login|login_type|loop|manual|mark_in_use_for_removal|masked|master|match|matched|max_queue_readers|max_duration|max_outstanding_io_per_volume|maxdop|maxerrors|maxlength|maxtransfersize|max_plans_per_query|max_storage_size_mb|mediadescription|medianame|mediapassword|memogroup|memory_optimized|merge|message|message_forward_size|message_forwarding|microsecond|millisecond|minute(s)?|mirror_address|misses_cursors|misses_exec_context|mixed|modify|money|month|move|multi_user|must_change|name|namespace|nanosecond|native|native_compilation|nchar|ncharacter|nested_triggers|never|new_account|new_broker|newname|next|no|no_browsetable|no_checksum|no_compression|no_infomsgs|no_triggers|no_truncate|nocount|noexec|noexpand|noformat|noinit|nolock|nonatomic|nonclustered|nondurable|none|norecompute|norecovery|noreset|norewind|noskip|not|notification|nounload|now|nowait|ntext|ntlm|nulls|numeric|numeric_roundabort|nvarchar|object|objid|oem|offline|old_account|online|operation_mode|open|openjson|optimistic|option|orc|out|outer|output|over|override|owner|ownership|pad_index|page|page_checksum|page_verify|pagecount|paglock|param|parameter_sniffing|parameter_type_expansion|parameterization|parquet|parseonly|partial|partition|partner|password|path|pause|percentage|permission_set|persisted|period|physical_only|plan_forcing_mode|policy|pool|population|ports|preceding|precision|predicate|presume_abort|primary|primary_role|print|prior|priority |priority_level|private|proc(edure)?|procedure_name|profile|provider|quarter|query_capture_mode|query_governor_cost_limit|query_optimizer_hotfixes|query_store|queue|quoted_identifier|raiserror|range|raw|rcfile|rc2|rc4|rc4_128|rdbms|read_committed_snapshot|read|read_only|read_write|readcommitted|readcommittedlock|readonly|readpast|readuncommitted|readwrite|real|rebuild|receive|recmodel_70backcomp|recompile|reconfigure|recovery|recursive|recursive_triggers|redo_queue|reject_sample_value|reject_type|reject_value|relative|remote|remote_data_archive|remote_proc_transactions|remote_service_name|remove|removed_cursors|removed_exec_context|reorganize|repeat|repeatable|repeatableread|replace|replica|replicated|replnick_100_to_80|replnickarray_80_to_100|replnickarray_100_to_80|required|required_cursopt|resample|reset|resource|resource_manager_location|respect|restart|restore|restricted_user|resume|retaindays|retention|return|revert|rewind|rewindonly|returns|robust|role|rollup|root|round_robin|route|row|rowdump|rowguidcol|rowlock|row_terminator|rows|rows_per_batch|rowsets_only|rowterminator|rowversion|rsa_1024|rsa_2048|rsa_3072|rsa_4096|rsa_512|safe|safety|sample|save|scalar|schema|schemabinding|scoped|scroll|scroll_locks|sddl|second|secexpr|seconds|secondary|secondary_only|secondary_role|secret|security|securityaudit|selective|self|send|sent|sequence|serde_method|serializable|server|service|service_broker|service_name|service_objective|session_timeout|session|sessions|seterror|setopts|sets|shard_map_manager|shard_map_name|sharded|shared_memory|shortest_path|show_statistics|showplan_all|showplan_text|showplan_xml|showplan_xml_with_recompile|shrinkdb|shutdown|sid|signature|simple|single_blob|single_clob|single_nclob|single_user|singleton|site|size|size_based_cleanup_mode|skip|smalldatetime|smallint|smallmoney|snapshot|snapshot_import|snapshotrestorephase|soap|softnuma|sort_in_tempdb|sorted_data|sorted_data_reorg|spatial|sql|sql_bigint|sql_binary|sql_bit|sql_char|sql_date|sql_decimal|sql_double|sql_float|sql_guid|sql_handle|sql_longvarbinary|sql_longvarchar|sql_numeric|sql_real|sql_smallint|sql_time|sql_timestamp|sql_tinyint|sql_tsi_day|sql_tsi_frac_second|sql_tsi_hour|sql_tsi_minute|sql_tsi_month|sql_tsi_quarter|sql_tsi_second|sql_tsi_week|sql_tsi_year|sql_type_date|sql_type_time|sql_type_timestamp|sql_varbinary|sql_varchar|sql_variant|sql_wchar|sql_wlongvarchar|ssl|ssl_port|standard|standby|start|start_date|started|stat_header|state|statement|static|statistics|statistics_incremental|statistics_norecompute|statistics_only|statman|stats|stats_stream|status|stop|stop_on_error|stopat|stopatmark|stopbeforemark|stoplist|stopped|string_delimiter|subject|supplemental_logging|supported|suspend|symmetric|synchronous_commit|synonym|sysname|system|system_time|system_versioning|table|tableresults|tablock|tablockx|take|tape|target|target_index|target_partition|target_recovery_time|tcp|temporal_history_retention|text|textimage_on|then|thesaurus|throw|time|timeout|timestamp|tinyint|to|top|torn_page_detection|track_columns_updated|trailing|tran|transaction|transfer|transform_noise_words|triple_des|triple_des_3key|truncate|trustworthy|try|tsql|two_digit_year_cutoff|type|type_desc|type_warning|tzoffset|uid|unbounded|uncommitted|unique|uniqueidentifier|unlimited|unload|unlock|unsafe|updlock|url|use|useplan|useroptions|use_type_default|using|utcdatetime|valid_xml|validation|value|values|varbinary|varchar|vector|verbose|verifyonly|version|view_metadata|virtual_device|visiblity|wait_at_low_priority|waitfor|webmethod|week|weekday|weight|well_formed_xml|when|while|widechar|widechar_ansi|widenative|window|windows|with|within|within group|witness|without|without_array_wrapper|workload|wsdl|xact_abort|xlock|xml|xmlschema|xquery|xsinil|year|zone)\\b", "name": "keyword.other.sql" }, { diff --git a/org.eclipse.tm4e.language_pack/syntaxes/swift/swift.tmLanguage.json b/org.eclipse.tm4e.language_pack/syntaxes/swift/swift.tmLanguage.json index 7d6694cbe..1d6b18c44 100644 --- a/org.eclipse.tm4e.language_pack/syntaxes/swift/swift.tmLanguage.json +++ b/org.eclipse.tm4e.language_pack/syntaxes/swift/swift.tmLanguage.json @@ -4,7 +4,7 @@ "If you want to provide a fix or improvement, please create a pull request against the original repository.", "Once accepted there, we are happy to receive an update request." ], - "version": "https://github.com/jtbandes/swift-tmlanguage/commit/b8d2889b4af1d8bad41578317a6adade642555a3", + "version": "https://github.com/jtbandes/swift-tmlanguage/commit/0897d8939a82ddcf6533e9f318e5942b1265416b", "name": "Swift", "scopeName": "source.swift", "comment": "See swift.tmbundle/grammar-test.swift for test cases.", @@ -1158,6 +1158,10 @@ } }, "patterns": [ + { + "match": "\\bsending\\b", + "name": "storage.modifier.swift" + }, { "include": "#declarations-available-types" } @@ -1228,6 +1232,9 @@ } }, "patterns": [ + { + "include": "#literals-numeric" + }, { "include": "#declarations-available-types" } @@ -1255,6 +1262,10 @@ "comment": "Swift 2: constraints inside the generic param list", "include": "#declarations-generic-where-clause" }, + { + "name": "keyword.other.declaration-specifier.swift", + "match": "\\blet\\b" + }, { "name": "keyword.control.loop.swift", "match": "\\beach\\b" @@ -1469,6 +1480,9 @@ "begin": "\\G", "end": "(?!\\G)$|(?=[={}]|(?!\\G)\\bwhere\\b)", "patterns": [ + { + "include": "#attributes" + }, { "include": "#comments" }, @@ -1500,6 +1514,9 @@ "begin": ",\\s*", "end": "(?!\\G)(?!//|/\\*)|(?=[,={}]|(?!\\G)\\bwhere\\b)", "patterns": [ + { + "include": "#attributes" + }, { "include": "#comments" }, @@ -1736,6 +1753,10 @@ "begin": ":\\s*(?!\\s)", "end": "(?=[,)])", "patterns": [ + { + "match": "\\bsending\\b", + "name": "storage.modifier.swift" + }, { "include": "#declarations-available-types" }, @@ -2807,7 +2828,7 @@ }, { "name": "keyword.control.transfer.swift", - "match": "(?\n (?> # no backtracking, avoids issues with negative lookbehind at end\n (?:\n \\\\Q\n (?:(?!\\\\E)(?!/\\2).)*+\n (?:\\\\E\n # A quoted sequence may not have a closing E, in which case it extends to the end of the regex\n | (?(3)|(?(\\{(?:\\g<-1>|(?!{).*?)\\}))\n (?:\\[(?!\\d)\\w+\\])?\n [X<>]?\n \\)\n | (?\\[ (?:\\\\. | [^\\[\\]] | \\g)+ \\])\n | \\(\\g?+\\)\n | (?:(?!/\\2)[^()\\[\\\\])+ # any character (until end)\n )+\n )\n)?+\n# may end with a space only if it is an extended literal or contains only a single escaped space\n(?(3)|(?(5)(?\n (?> # no backtracking, avoids issues with negative lookbehind at end\n (?:\n \\\\Q\n (?:(?!\\\\E)(?!/).)*+\n # A quoted sequence may not have a closing E, in which case it extends to the end of the regex\n (?:\\\\E | (?=/))\n | \\\\.\n | \\(\\?\\#[^)]*\\)\n | \\(\\?\n # InterpolatedCallout\n (?>\n {[^{].*?}\n | {{[^{].*?}}\n | {{{[^{].*?}}}\n | {{{{[^{].*?}}}}\n | {{{{{[^{].*?}}}}}\n | {{{{{{.+?}}}}}}\n )\n (?:\\[(?!\\d)\\w+\\])?\n [X<>]?\n \\)\n # Allow nested character classes to a limited depth\n | \\[(?:\n \\\\. |\n [^\\[\\]\\\\] |\n \\[(?:\n \\\\. |\n [^\\[\\]\\\\] |\n \\[(?:\n \\\\. |\n [^\\[\\]\\\\] |\n \\[(?:\n \\\\. |\n [^\\[\\]\\\\]\n )+\\]\n )+\\]\n )+\\]\n )+\\]\n | \\(\\g?+\\)\n | (?:(?!/)[^()\\[\\\\])+ # any character (until end)\n )+\n )\n )?+\n (?\n (?> # no backtracking, avoids issues with negative lookbehind at end\n (?:\n \\\\Q\n (?:(?!\\\\E)(?!/\\2).)*+\n # A quoted sequence may not have a closing E, in which case it extends to the end of the regex\n (?:\\\\E | (?=/\\2))\n | \\\\.\n | \\(\\?\\#[^)]*\\)\n | \\(\\?\n # InterpolatedCallout\n (?>\n {[^{].*?}\n | {{[^{].*?}}\n | {{{[^{].*?}}}\n | {{{{[^{].*?}}}}\n | {{{{{[^{].*?}}}}}\n | {{{{{{.+?}}}}}}\n )\n (?:\\[(?!\\d)\\w+\\])?\n [X<>]?\n \\)\n # Allow nested character classes to a limited depth\n | \\[(?:\n \\\\. |\n [^\\[\\]\\\\] |\n \\[(?:\n \\\\. |\n [^\\[\\]\\\\] |\n \\[(?:\n \\\\. |\n [^\\[\\]\\\\] |\n \\[(?:\n \\\\. |\n [^\\[\\]\\\\]\n )+\\]\n )+\\]\n )+\\]\n )+\\]\n | \\(\\g?+\\)\n | (?:(?!/\\2)[^()\\[\\\\])+ # any character (until end)\n )+\n )\n)?+\n(/\\2) # (4)\n| \\#+/.+(\\n)", + "captures": { + "0": { + "patterns": [ + { + "include": "#literals-regular-expression-literal-regex-guts" + } + ] }, - "9": { + "1": { + "name": "punctuation.definition.string.begin.regexp.swift" + }, + "4": { + "name": "punctuation.definition.string.end.regexp.swift" + }, + "5": { "name": "invalid.illegal.returns-not-allowed.regexp" } } diff --git a/org.eclipse.tm4e.language_pack/syntaxes/typescript/typescript.language-configuration.json b/org.eclipse.tm4e.language_pack/syntaxes/typescript/typescript.language-configuration.json index e7fadc46b..336daa913 100644 --- a/org.eclipse.tm4e.language_pack/syntaxes/typescript/typescript.language-configuration.json +++ b/org.eclipse.tm4e.language_pack/syntaxes/typescript/typescript.language-configuration.json @@ -139,7 +139,7 @@ "pattern": "^(\\t|[ ])*[ ]\\*[^/]*\\*/\\s*$|^(\\t|[ ])*[ ]\\*/\\s*$|^(\\t|[ ])*\\*([ ]([^\\*]|\\*(?!/))*)?$" }, "indentNextLinePattern": { - "pattern": "^((.*=>\\s*)|((.*[^\\w]+|\\s*)(if|while|for)\\s*\\(.*\\)\\s*))$" + "pattern": "^((.*=>\\s*)|((.*[^\\w]+|\\s*)((if|while|for)\\s*\\(.*\\)\\s*|else\\s*)))$" } }, "onEnterRules": [ @@ -248,12 +248,8 @@ }, // Add // when pressing enter from inside line comment { - "beforeText": { - "pattern": "(?\\s*)|((.*[^\\w]+|\\s*)(if|while|for)\\s*\\(.*\\)\\s*))$" + "pattern": "^((.*=>\\s*)|((.*[^\\w]+|\\s*)((if|while|for)\\s*\\(.*\\)\\s*|else\\s*)))$" } }, "onEnterRules": [ @@ -248,12 +248,8 @@ }, // Add // when pressing enter from inside line comment { - "beforeText": { - "pattern": "(? Date: Wed, 8 Oct 2025 11:09:26 +0000 Subject: [PATCH 11/21] ci(deps): bump github/codeql-action from 3 to 4 Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3 to 4. - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/v3...v4) --- updated-dependencies: - dependency-name: github/codeql-action dependency-version: '4' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/codeql.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 07cd02361..3a875d83c 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -83,13 +83,13 @@ jobs: - name: Initialize CodeQL - uses: github/codeql-action/init@v3 + uses: github/codeql-action/init@v4 with: languages: ${{ matrix.language }} build-mode: ${{ matrix.build-mode }} - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v3 + uses: github/codeql-action/analyze@v4 with: category: "/language:${{matrix.language}}" From d57f205b4538dbf38ba214128ce3902697476fe7 Mon Sep 17 00:00:00 2001 From: sebthom Date: Mon, 13 Oct 2025 11:33:11 +0200 Subject: [PATCH 12/21] build: upgrade to Maven 3.9.11 and mvnw 3.3.4 --- .mvn/wrapper/maven-wrapper.properties | 20 +--------- mvnw | 50 ++++++++++++++++++++---- mvnw.cmd | 56 +++++++++++++++++++++++---- 3 files changed, 93 insertions(+), 33 deletions(-) diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties index d58dfb70b..c0bcafe98 100644 --- a/.mvn/wrapper/maven-wrapper.properties +++ b/.mvn/wrapper/maven-wrapper.properties @@ -1,19 +1,3 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -wrapperVersion=3.3.2 +wrapperVersion=3.3.4 distributionType=only-script -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.11/apache-maven-3.9.11-bin.zip diff --git a/mvnw b/mvnw index 19529ddf8..bd8896bf2 100755 --- a/mvnw +++ b/mvnw @@ -19,7 +19,7 @@ # ---------------------------------------------------------------------------- # ---------------------------------------------------------------------------- -# Apache Maven Wrapper startup batch script, version 3.3.2 +# Apache Maven Wrapper startup batch script, version 3.3.4 # # Optional ENV vars # ----------------- @@ -105,14 +105,17 @@ trim() { printf "%s" "${1}" | tr -d '[:space:]' } +scriptDir="$(dirname "$0")" +scriptName="$(basename "$0")" + # parse distributionUrl and optional distributionSha256Sum, requires .mvn/wrapper/maven-wrapper.properties while IFS="=" read -r key value; do case "${key-}" in distributionUrl) distributionUrl=$(trim "${value-}") ;; distributionSha256Sum) distributionSha256Sum=$(trim "${value-}") ;; esac -done <"${0%/*}/.mvn/wrapper/maven-wrapper.properties" -[ -n "${distributionUrl-}" ] || die "cannot read distributionUrl property in ${0%/*}/.mvn/wrapper/maven-wrapper.properties" +done <"$scriptDir/.mvn/wrapper/maven-wrapper.properties" +[ -n "${distributionUrl-}" ] || die "cannot read distributionUrl property in $scriptDir/.mvn/wrapper/maven-wrapper.properties" case "${distributionUrl##*/}" in maven-mvnd-*bin.*) @@ -130,7 +133,7 @@ maven-mvnd-*bin.*) distributionUrl="${distributionUrl%-bin.*}-$distributionPlatform.zip" ;; maven-mvnd-*) MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/ ;; -*) MVN_CMD="mvn${0##*/mvnw}" _MVNW_REPO_PATTERN=/org/apache/maven/ ;; +*) MVN_CMD="mvn${scriptName#mvnw}" _MVNW_REPO_PATTERN=/org/apache/maven/ ;; esac # apply MVNW_REPOURL and calculate MAVEN_HOME @@ -227,7 +230,7 @@ if [ -n "${distributionSha256Sum-}" ]; then echo "Please disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2 exit 1 elif command -v sha256sum >/dev/null; then - if echo "$distributionSha256Sum $TMP_DOWNLOAD_DIR/$distributionUrlName" | sha256sum -c >/dev/null 2>&1; then + if echo "$distributionSha256Sum $TMP_DOWNLOAD_DIR/$distributionUrlName" | sha256sum -c - >/dev/null 2>&1; then distributionSha256Result=true fi elif command -v shasum >/dev/null; then @@ -252,8 +255,41 @@ if command -v unzip >/dev/null; then else tar xzf${__MVNW_QUIET_TAR:+"$__MVNW_QUIET_TAR"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -C "$TMP_DOWNLOAD_DIR" || die "failed to untar" fi -printf %s\\n "$distributionUrl" >"$TMP_DOWNLOAD_DIR/$distributionUrlNameMain/mvnw.url" -mv -- "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" "$MAVEN_HOME" || [ -d "$MAVEN_HOME" ] || die "fail to move MAVEN_HOME" + +# Find the actual extracted directory name (handles snapshots where filename != directory name) +actualDistributionDir="" + +# First try the expected directory name (for regular distributions) +if [ -d "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" ]; then + if [ -f "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain/bin/$MVN_CMD" ]; then + actualDistributionDir="$distributionUrlNameMain" + fi +fi + +# If not found, search for any directory with the Maven executable (for snapshots) +if [ -z "$actualDistributionDir" ]; then + # enable globbing to iterate over items + set +f + for dir in "$TMP_DOWNLOAD_DIR"/*; do + if [ -d "$dir" ]; then + if [ -f "$dir/bin/$MVN_CMD" ]; then + actualDistributionDir="$(basename "$dir")" + break + fi + fi + done + set -f +fi + +if [ -z "$actualDistributionDir" ]; then + verbose "Contents of $TMP_DOWNLOAD_DIR:" + verbose "$(ls -la "$TMP_DOWNLOAD_DIR")" + die "Could not find Maven distribution directory in extracted archive" +fi + +verbose "Found extracted Maven distribution directory: $actualDistributionDir" +printf %s\\n "$distributionUrl" >"$TMP_DOWNLOAD_DIR/$actualDistributionDir/mvnw.url" +mv -- "$TMP_DOWNLOAD_DIR/$actualDistributionDir" "$MAVEN_HOME" || [ -d "$MAVEN_HOME" ] || die "fail to move MAVEN_HOME" clean || : exec_maven "$@" diff --git a/mvnw.cmd b/mvnw.cmd index 249bdf382..92450f932 100644 --- a/mvnw.cmd +++ b/mvnw.cmd @@ -19,7 +19,7 @@ @REM ---------------------------------------------------------------------------- @REM ---------------------------------------------------------------------------- -@REM Apache Maven Wrapper startup batch script, version 3.3.2 +@REM Apache Maven Wrapper startup batch script, version 3.3.4 @REM @REM Optional ENV vars @REM MVNW_REPOURL - repo url base for downloading maven distribution @@ -40,7 +40,7 @@ @SET __MVNW_ARG0_NAME__= @SET MVNW_USERNAME= @SET MVNW_PASSWORD= -@IF NOT "%__MVNW_CMD__%"=="" (%__MVNW_CMD__% %*) +@IF NOT "%__MVNW_CMD__%"=="" ("%__MVNW_CMD__%" %*) @echo Cannot start maven from wrapper >&2 && exit /b 1 @GOTO :EOF : end batch / begin powershell #> @@ -73,16 +73,30 @@ switch -wildcard -casesensitive ( $($distributionUrl -replace '^.*/','') ) { # apply MVNW_REPOURL and calculate MAVEN_HOME # maven home pattern: ~/.m2/wrapper/dists/{apache-maven-,maven-mvnd--}/ if ($env:MVNW_REPOURL) { - $MVNW_REPO_PATTERN = if ($USE_MVND) { "/org/apache/maven/" } else { "/maven/mvnd/" } - $distributionUrl = "$env:MVNW_REPOURL$MVNW_REPO_PATTERN$($distributionUrl -replace '^.*'+$MVNW_REPO_PATTERN,'')" + $MVNW_REPO_PATTERN = if ($USE_MVND -eq $False) { "/org/apache/maven/" } else { "/maven/mvnd/" } + $distributionUrl = "$env:MVNW_REPOURL$MVNW_REPO_PATTERN$($distributionUrl -replace "^.*$MVNW_REPO_PATTERN",'')" } $distributionUrlName = $distributionUrl -replace '^.*/','' $distributionUrlNameMain = $distributionUrlName -replace '\.[^.]*$','' -replace '-bin$','' -$MAVEN_HOME_PARENT = "$HOME/.m2/wrapper/dists/$distributionUrlNameMain" + +$MAVEN_M2_PATH = "$HOME/.m2" if ($env:MAVEN_USER_HOME) { - $MAVEN_HOME_PARENT = "$env:MAVEN_USER_HOME/wrapper/dists/$distributionUrlNameMain" + $MAVEN_M2_PATH = "$env:MAVEN_USER_HOME" +} + +if (-not (Test-Path -Path $MAVEN_M2_PATH)) { + New-Item -Path $MAVEN_M2_PATH -ItemType Directory | Out-Null +} + +$MAVEN_WRAPPER_DISTS = $null +if ((Get-Item $MAVEN_M2_PATH).Target[0] -eq $null) { + $MAVEN_WRAPPER_DISTS = "$MAVEN_M2_PATH/wrapper/dists" +} else { + $MAVEN_WRAPPER_DISTS = (Get-Item $MAVEN_M2_PATH).Target[0] + "/wrapper/dists" } -$MAVEN_HOME_NAME = ([System.Security.Cryptography.MD5]::Create().ComputeHash([byte[]][char[]]$distributionUrl) | ForEach-Object {$_.ToString("x2")}) -join '' + +$MAVEN_HOME_PARENT = "$MAVEN_WRAPPER_DISTS/$distributionUrlNameMain" +$MAVEN_HOME_NAME = ([System.Security.Cryptography.SHA256]::Create().ComputeHash([byte[]][char[]]$distributionUrl) | ForEach-Object {$_.ToString("x2")}) -join '' $MAVEN_HOME = "$MAVEN_HOME_PARENT/$MAVEN_HOME_NAME" if (Test-Path -Path "$MAVEN_HOME" -PathType Container) { @@ -134,7 +148,33 @@ if ($distributionSha256Sum) { # unzip and move Expand-Archive "$TMP_DOWNLOAD_DIR/$distributionUrlName" -DestinationPath "$TMP_DOWNLOAD_DIR" | Out-Null -Rename-Item -Path "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" -NewName $MAVEN_HOME_NAME | Out-Null + +# Find the actual extracted directory name (handles snapshots where filename != directory name) +$actualDistributionDir = "" + +# First try the expected directory name (for regular distributions) +$expectedPath = Join-Path "$TMP_DOWNLOAD_DIR" "$distributionUrlNameMain" +$expectedMvnPath = Join-Path "$expectedPath" "bin/$MVN_CMD" +if ((Test-Path -Path $expectedPath -PathType Container) -and (Test-Path -Path $expectedMvnPath -PathType Leaf)) { + $actualDistributionDir = $distributionUrlNameMain +} + +# If not found, search for any directory with the Maven executable (for snapshots) +if (!$actualDistributionDir) { + Get-ChildItem -Path "$TMP_DOWNLOAD_DIR" -Directory | ForEach-Object { + $testPath = Join-Path $_.FullName "bin/$MVN_CMD" + if (Test-Path -Path $testPath -PathType Leaf) { + $actualDistributionDir = $_.Name + } + } +} + +if (!$actualDistributionDir) { + Write-Error "Could not find Maven distribution directory in extracted archive" +} + +Write-Verbose "Found extracted Maven distribution directory: $actualDistributionDir" +Rename-Item -Path "$TMP_DOWNLOAD_DIR/$actualDistributionDir" -NewName $MAVEN_HOME_NAME | Out-Null try { Move-Item -Path "$TMP_DOWNLOAD_DIR/$MAVEN_HOME_NAME" -Destination $MAVEN_HOME_PARENT | Out-Null } catch { From 8e7562e29560330fc9b590190c16279f00b6dfc1 Mon Sep 17 00:00:00 2001 From: sebthom Date: Mon, 13 Oct 2025 11:53:14 +0200 Subject: [PATCH 13/21] test: update target platforms --- target-platforms/latest.target | 4 ++-- target-platforms/unstable.target | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/target-platforms/latest.target b/target-platforms/latest.target index c770d39e2..dd33f0be5 100644 --- a/target-platforms/latest.target +++ b/target-platforms/latest.target @@ -8,9 +8,9 @@ - + - + diff --git a/target-platforms/unstable.target b/target-platforms/unstable.target index 9489de75c..418c9ba69 100644 --- a/target-platforms/unstable.target +++ b/target-platforms/unstable.target @@ -8,9 +8,9 @@ - + - + @@ -37,5 +37,5 @@ - + From 794716a8d226ce892a99d5721052ba82d867c575 Mon Sep 17 00:00:00 2001 From: sebthom Date: Mon, 13 Oct 2025 13:41:06 +0200 Subject: [PATCH 14/21] refact: upgrade to Java 21 and require Eclipse 2024-06+ --- .github/workflows/build.yml | 8 ++++---- Jenkinsfile | 6 +++--- README.md | 15 ++++++++------- org.eclipse.tm4e.core.tests/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- org.eclipse.tm4e.core.tests/META-INF/MANIFEST.MF | 4 ++-- org.eclipse.tm4e.core.tests/pom.xml | 2 +- org.eclipse.tm4e.core/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- org.eclipse.tm4e.core/META-INF/MANIFEST.MF | 4 ++-- org.eclipse.tm4e.core/pom.xml | 2 +- .../internal/parser/TMParserPropertyPath.java | 4 ---- org.eclipse.tm4e.feature/feature.xml | 2 +- org.eclipse.tm4e.feature/pom.xml | 2 +- .../feature.xml | 2 +- org.eclipse.tm4e.language_pack.feature/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 8 ++++---- org.eclipse.tm4e.language_pack/pom.xml | 2 +- .../updater/.settings/org.eclipse.jdt.core.prefs | 10 +++++----- org.eclipse.tm4e.language_pack/updater/pom.xml | 2 +- .../.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- .../META-INF/MANIFEST.MF | 4 ++-- .../pom.xml | 2 +- org.eclipse.tm4e.languageconfiguration/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- .../META-INF/MANIFEST.MF | 10 +++++----- org.eclipse.tm4e.languageconfiguration/pom.xml | 2 +- org.eclipse.tm4e.markdown/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- org.eclipse.tm4e.markdown/META-INF/MANIFEST.MF | 10 +++++----- org.eclipse.tm4e.markdown/pom.xml | 2 +- org.eclipse.tm4e.registry/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- org.eclipse.tm4e.registry/META-INF/MANIFEST.MF | 6 +++--- org.eclipse.tm4e.registry/pom.xml | 2 +- org.eclipse.tm4e.repository/pom.xml | 2 +- org.eclipse.tm4e.samples/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- org.eclipse.tm4e.samples/META-INF/MANIFEST.MF | 8 ++++---- org.eclipse.tm4e.samples/pom.xml | 2 +- org.eclipse.tm4e.ui.tests/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- org.eclipse.tm4e.ui.tests/META-INF/MANIFEST.MF | 4 ++-- org.eclipse.tm4e.ui.tests/pom.xml | 2 +- org.eclipse.tm4e.ui/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- org.eclipse.tm4e.ui/META-INF/MANIFEST.MF | 8 ++++---- org.eclipse.tm4e.ui/pom.xml | 2 +- pom.xml | 4 ++-- target-platforms/oldest.target | 4 ++-- 51 files changed, 109 insertions(+), 112 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 96a7c2d36..f8eb0a97c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -129,18 +129,18 @@ jobs: sudo apt-get install --no-install-recommends -y xdg-utils - - name: "Install: JDK 17 for Compilation ☕" + - name: "Install: JDK 21 for Compilation ☕" uses: actions/setup-java@v5 # https://github.com/actions/setup-java with: distribution: temurin - java-version: 17 + java-version: 21 - - name: "Install: JDK 21 for Maven/Tycho ☕" + - name: "Install: JDK 25 for Maven/Tycho ☕" uses: actions/setup-java@v5 # https://github.com/actions/setup-java with: distribution: temurin - java-version: 21 + java-version: 25 - name: "Cache: Local Maven Repository" diff --git a/Jenkinsfile b/Jenkinsfile index 9d5d1cded..6c6a5cf78 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -29,7 +29,7 @@ pipeline { stage('Setup Maven Toolchains') { steps { script { try { - def jdk17 = tool name: 'temurin-jdk17-latest', type: 'jdk' + def jdk21 = tool name: 'temurin-jdk21-latest', type: 'jdk' // Generate toolchains.xml for Maven Toolchains plugin writeFile file: "/tmp/toolchains.xml", text: """ @@ -37,11 +37,11 @@ pipeline { jdk - 17 + 21 temurin - ${jdk17} + ${jdk21} diff --git a/README.md b/README.md index 4bbdc415f..5954e4b41 100644 --- a/README.md +++ b/README.md @@ -22,13 +22,14 @@ The latest snapshot build can be installed from the update site [https://downloa TM4E version | Min. Eclipse version -------------|-------------------- -[latest](https://download.eclipse.org/tm4e/releases/latest/) | [2023-09](https://projects.eclipse.org/releases/2023-09) ([4.29](https://projects.eclipse.org/projects/eclipse/releases/4.29.0)) -[0.9.0](https://download.eclipse.org/tm4e/releases/0.9/)+ | [2023-09](https://projects.eclipse.org/releases/2023-09) ([4.29](https://projects.eclipse.org/projects/eclipse/releases/4.29.0)) -[0.8.1](https://download.eclipse.org/tm4e/releases/0.8.1/)+ | [2023-06](https://projects.eclipse.org/releases/2023-06) ([4.28](https://projects.eclipse.org/projects/eclipse/releases/4.28.0)) -[0.8](https://download.eclipse.org/tm4e/releases/0.8/)+ | [2023-03](https://projects.eclipse.org/releases/2023-03) ([4.27](https://projects.eclipse.org/projects/eclipse/releases/4.27.0)) -[0.6.3](https://download.eclipse.org/tm4e/releases/0.6.3/)+ | [2022-12](https://projects.eclipse.org/releases/2022-12) ([4.26](https://projects.eclipse.org/projects/eclipse/releases/4.26.0)) -[0.6.2](https://download.eclipse.org/tm4e/releases/0.6.2/)+ | [2022-09](https://projects.eclipse.org/releases/2022-09) ([4.25](https://projects.eclipse.org/projects/eclipse/releases/4.25.0)) -[0.6.0](https://download.eclipse.org/tm4e/releases/0.6.0/)+ | [2022-03](https://projects.eclipse.org/releases/2022-03) ([4.23](https://projects.eclipse.org/projects/eclipse/releases/4.23.0)) +[latest](https://download.eclipse.org/tm4e/releases/latest/) | [2024-06](https://projects.eclipse.org/releases/2024-06) ([4.32](https://projects.eclipse.org/projects/eclipse/releases/4.32.0)) +[0.16.0](https://download.eclipse.org/tm4e/releases/0.16.0/)+ | [2024-06](https://projects.eclipse.org/releases/2024-06) ([4.32](https://projects.eclipse.org/projects/eclipse/releases/4.32.0)) +[0.9.0](https://download.eclipse.org/tm4e/releases/0.9.0/)+ | [2023-09](https://projects.eclipse.org/releases/2023-09) ([4.29](https://projects.eclipse.org/projects/eclipse/releases/4.29.0)) +[0.8.1](https://download.eclipse.org/tm4e/releases/0.8.1/)+ | [2023-06](https://projects.eclipse.org/releases/2023-06) ([4.28](https://projects.eclipse.org/projects/eclipse/releases/4.28.0)) +[0.8](https://download.eclipse.org/tm4e/releases/0.8/)+ | [2023-03](https://projects.eclipse.org/releases/2023-03) ([4.27](https://projects.eclipse.org/projects/eclipse/releases/4.27.0)) +[0.6.3](https://download.eclipse.org/tm4e/releases/0.6.3/)+ | [2022-12](https://projects.eclipse.org/releases/2022-12) ([4.26](https://projects.eclipse.org/projects/eclipse/releases/4.26.0)) +[0.6.2](https://download.eclipse.org/tm4e/releases/0.6.2/)+ | [2022-09](https://projects.eclipse.org/releases/2022-09) ([4.25](https://projects.eclipse.org/projects/eclipse/releases/4.25.0)) +[0.6.0](https://download.eclipse.org/tm4e/releases/0.6.0/)+ | [2022-03](https://projects.eclipse.org/releases/2022-03) ([4.23](https://projects.eclipse.org/projects/eclipse/releases/4.23.0)) ### 2) as a Java API with Maven diff --git a/org.eclipse.tm4e.core.tests/.classpath b/org.eclipse.tm4e.core.tests/.classpath index 55bce8855..9ef9a2055 100644 --- a/org.eclipse.tm4e.core.tests/.classpath +++ b/org.eclipse.tm4e.core.tests/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.tm4e.core.tests/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.tm4e.core.tests/.settings/org.eclipse.jdt.core.prefs index 37f829283..42ea09faa 100644 --- a/org.eclipse.tm4e.core.tests/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.tm4e.core.tests/.settings/org.eclipse.jdt.core.prefs @@ -11,9 +11,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable.secondary= org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.compliance=21 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -129,7 +129,7 @@ org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=17 +org.eclipse.jdt.core.compiler.source=21 org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647 org.eclipse.jdt.core.formatter.align_selector_in_method_invocation_on_expression_first_line=false diff --git a/org.eclipse.tm4e.core.tests/META-INF/MANIFEST.MF b/org.eclipse.tm4e.core.tests/META-INF/MANIFEST.MF index 5b3ed02a8..8cee45457 100644 --- a/org.eclipse.tm4e.core.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.tm4e.core.tests/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-Localization: plugin Bundle-SymbolicName: org.eclipse.tm4e.core.tests;singleton:=true -Bundle-Version: 0.15.2.qualifier +Bundle-Version: 0.16.0.qualifier Require-Bundle: org.apache.batik.css, org.apache.batik.util, com.google.gson, @@ -15,6 +15,6 @@ Import-Package: org.junit.jupiter.api, org.junit.jupiter.api.function, org.w3c.css.sac, org.w3c.css.sac.helpers -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-ActivationPolicy: lazy Automatic-Module-Name: org.eclipse.tm4e.core.tests diff --git a/org.eclipse.tm4e.core.tests/pom.xml b/org.eclipse.tm4e.core.tests/pom.xml index 51541f140..5ef75e29c 100644 --- a/org.eclipse.tm4e.core.tests/pom.xml +++ b/org.eclipse.tm4e.core.tests/pom.xml @@ -5,7 +5,7 @@ org.eclipse org.eclipse.tm4e - 0.15.2-SNAPSHOT + 0.16.0-SNAPSHOT org.eclipse.tm4e.core.tests diff --git a/org.eclipse.tm4e.core/.classpath b/org.eclipse.tm4e.core/.classpath index 9165cb465..aa25c80eb 100644 --- a/org.eclipse.tm4e.core/.classpath +++ b/org.eclipse.tm4e.core/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.tm4e.core/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.tm4e.core/.settings/org.eclipse.jdt.core.prefs index a49659d2c..543db3986 100644 --- a/org.eclipse.tm4e.core/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.tm4e.core/.settings/org.eclipse.jdt.core.prefs @@ -14,9 +14,9 @@ org.eclipse.jdt.core.compiler.annotation.owning=org.eclipse.jdt.annotation.Ownin org.eclipse.jdt.core.compiler.annotation.resourceanalysis=disabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.compliance=21 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -134,7 +134,7 @@ org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=17 +org.eclipse.jdt.core.compiler.source=21 org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647 org.eclipse.jdt.core.formatter.align_selector_in_method_invocation_on_expression_first_line=false diff --git a/org.eclipse.tm4e.core/META-INF/MANIFEST.MF b/org.eclipse.tm4e.core/META-INF/MANIFEST.MF index ba913817c..e22bc277a 100644 --- a/org.eclipse.tm4e.core/META-INF/MANIFEST.MF +++ b/org.eclipse.tm4e.core/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-Localization: plugin Bundle-SymbolicName: org.eclipse.tm4e.core -Bundle-Version: 0.15.2.qualifier +Bundle-Version: 0.16.0.qualifier Require-Bundle: com.google.gson;bundle-version="[2.13.1,3.0.0)", org.apache.batik.css;bundle-version="[1.19.0,2.0.0)", org.apache.batik.util;bundle-version="[1.19.0,2.0.0)", @@ -14,7 +14,7 @@ Require-Bundle: com.google.gson;bundle-version="[2.13.1,3.0.0)", Import-Package: org.w3c.css.sac, org.w3c.css.sac.helpers, org.w3c.dom.css -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Export-Package: org.eclipse.tm4e.core, org.eclipse.tm4e.core.grammar, org.eclipse.tm4e.core.internal.grammar;x-friends:="org.eclipse.tm4e.core.tests,org.eclipse.tm4e.ui", diff --git a/org.eclipse.tm4e.core/pom.xml b/org.eclipse.tm4e.core/pom.xml index 6a061e98d..d8b35a92d 100644 --- a/org.eclipse.tm4e.core/pom.xml +++ b/org.eclipse.tm4e.core/pom.xml @@ -5,7 +5,7 @@ org.eclipse org.eclipse.tm4e - 0.15.2-SNAPSHOT + 0.16.0-SNAPSHOT org.eclipse.tm4e.core diff --git a/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/internal/parser/TMParserPropertyPath.java b/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/internal/parser/TMParserPropertyPath.java index ab93429b5..b88e98de7 100644 --- a/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/internal/parser/TMParserPropertyPath.java +++ b/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/internal/parser/TMParserPropertyPath.java @@ -62,10 +62,6 @@ public Object last() { return get(size() - 1); } - Object removeLast() { - return remove(size() - 1); - } - @Override public String toString() { return "/" + stream() diff --git a/org.eclipse.tm4e.feature/feature.xml b/org.eclipse.tm4e.feature/feature.xml index 29f3fc47b..964945ed7 100644 --- a/org.eclipse.tm4e.feature/feature.xml +++ b/org.eclipse.tm4e.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.tm4e.feature/pom.xml b/org.eclipse.tm4e.feature/pom.xml index 363d09d79..3cc660a53 100644 --- a/org.eclipse.tm4e.feature/pom.xml +++ b/org.eclipse.tm4e.feature/pom.xml @@ -5,7 +5,7 @@ org.eclipse org.eclipse.tm4e - 0.15.2-SNAPSHOT + 0.16.0-SNAPSHOT org.eclipse.tm4e.feature diff --git a/org.eclipse.tm4e.language_pack.feature/feature.xml b/org.eclipse.tm4e.language_pack.feature/feature.xml index 38183910a..9e5b6de71 100644 --- a/org.eclipse.tm4e.language_pack.feature/feature.xml +++ b/org.eclipse.tm4e.language_pack.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.tm4e.language_pack.feature/pom.xml b/org.eclipse.tm4e.language_pack.feature/pom.xml index 886a8dc55..607c034dd 100644 --- a/org.eclipse.tm4e.language_pack.feature/pom.xml +++ b/org.eclipse.tm4e.language_pack.feature/pom.xml @@ -5,7 +5,7 @@ org.eclipse org.eclipse.tm4e - 0.15.2-SNAPSHOT + 0.16.0-SNAPSHOT org.eclipse.tm4e.language_pack.feature diff --git a/org.eclipse.tm4e.language_pack/META-INF/MANIFEST.MF b/org.eclipse.tm4e.language_pack/META-INF/MANIFEST.MF index 91d8040a3..8ce7693ad 100644 --- a/org.eclipse.tm4e.language_pack/META-INF/MANIFEST.MF +++ b/org.eclipse.tm4e.language_pack/META-INF/MANIFEST.MF @@ -4,10 +4,10 @@ Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-Localization: plugin Bundle-SymbolicName: org.eclipse.tm4e.language_pack;singleton:=true -Bundle-Version: 0.15.2.qualifier -Require-Bundle: org.eclipse.tm4e.ui;bundle-version="0.15.2", - org.eclipse.tm4e.registry;bundle-version="0.15.2", - org.eclipse.tm4e.languageconfiguration;bundle-version="0.15.2", +Bundle-Version: 0.16.0.qualifier +Require-Bundle: org.eclipse.tm4e.ui;bundle-version="0.16.0", + org.eclipse.tm4e.registry;bundle-version="0.16.0", + org.eclipse.tm4e.languageconfiguration;bundle-version="0.16.0", org.eclipse.ui.editors;bundle-version="[3.3.0,4.0.0)", org.eclipse.ui.genericeditor;bundle-version="[1.0.0,2.0.0)", org.eclipse.core.contenttype;bundle-version="[3.2.0,4.0.0)", diff --git a/org.eclipse.tm4e.language_pack/pom.xml b/org.eclipse.tm4e.language_pack/pom.xml index 3bceb39d2..a4a392371 100644 --- a/org.eclipse.tm4e.language_pack/pom.xml +++ b/org.eclipse.tm4e.language_pack/pom.xml @@ -5,7 +5,7 @@ org.eclipse org.eclipse.tm4e - 0.15.2-SNAPSHOT + 0.16.0-SNAPSHOT org.eclipse.tm4e.language_pack diff --git a/org.eclipse.tm4e.language_pack/updater/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.tm4e.language_pack/updater/.settings/org.eclipse.jdt.core.prefs index b07a41a25..408daa7c8 100644 --- a/org.eclipse.tm4e.language_pack/updater/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.tm4e.language_pack/updater/.settings/org.eclipse.jdt.core.prefs @@ -1,12 +1,12 @@ eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 -org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 +org.eclipse.jdt.core.compiler.compliance=21 org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.processAnnotations=disabled -org.eclipse.jdt.core.compiler.release=disabled -org.eclipse.jdt.core.compiler.source=17 +org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=21 org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647 org.eclipse.jdt.core.formatter.align_selector_in_method_invocation_on_expression_first_line=false diff --git a/org.eclipse.tm4e.language_pack/updater/pom.xml b/org.eclipse.tm4e.language_pack/updater/pom.xml index 3407cf529..ab30ee7fe 100644 --- a/org.eclipse.tm4e.language_pack/updater/pom.xml +++ b/org.eclipse.tm4e.language_pack/updater/pom.xml @@ -9,7 +9,7 @@ org.eclipse org.eclipse.tm4e - 0.15.2-SNAPSHOT + 0.16.0-SNAPSHOT ../.. diff --git a/org.eclipse.tm4e.languageconfiguration.tests/.classpath b/org.eclipse.tm4e.languageconfiguration.tests/.classpath index 64721289d..550bff4cd 100644 --- a/org.eclipse.tm4e.languageconfiguration.tests/.classpath +++ b/org.eclipse.tm4e.languageconfiguration.tests/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.tm4e.languageconfiguration.tests/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.tm4e.languageconfiguration.tests/.settings/org.eclipse.jdt.core.prefs index 37f829283..42ea09faa 100644 --- a/org.eclipse.tm4e.languageconfiguration.tests/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.tm4e.languageconfiguration.tests/.settings/org.eclipse.jdt.core.prefs @@ -11,9 +11,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable.secondary= org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.compliance=21 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -129,7 +129,7 @@ org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=17 +org.eclipse.jdt.core.compiler.source=21 org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647 org.eclipse.jdt.core.formatter.align_selector_in_method_invocation_on_expression_first_line=false diff --git a/org.eclipse.tm4e.languageconfiguration.tests/META-INF/MANIFEST.MF b/org.eclipse.tm4e.languageconfiguration.tests/META-INF/MANIFEST.MF index e6665e7ae..ecc5010e6 100644 --- a/org.eclipse.tm4e.languageconfiguration.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.tm4e.languageconfiguration.tests/META-INF/MANIFEST.MF @@ -2,10 +2,10 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Tests for TM4E language configuration support Bundle-SymbolicName: org.eclipse.tm4e.languageconfiguration.tests;singleton:=true -Bundle-Version: 0.15.2.qualifier +Bundle-Version: 0.16.0.qualifier Bundle-Vendor: Eclipse TM4E Automatic-Module-Name: org.eclipse.tm4e.languageconfiguration.tests -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Require-Bundle: org.eclipse.core.runtime, org.eclipse.core.resources, org.eclipse.jface.text, diff --git a/org.eclipse.tm4e.languageconfiguration.tests/pom.xml b/org.eclipse.tm4e.languageconfiguration.tests/pom.xml index 57d2527c4..06f502b49 100644 --- a/org.eclipse.tm4e.languageconfiguration.tests/pom.xml +++ b/org.eclipse.tm4e.languageconfiguration.tests/pom.xml @@ -5,7 +5,7 @@ org.eclipse org.eclipse.tm4e - 0.15.2-SNAPSHOT + 0.16.0-SNAPSHOT org.eclipse.tm4e.languageconfiguration.tests diff --git a/org.eclipse.tm4e.languageconfiguration/.classpath b/org.eclipse.tm4e.languageconfiguration/.classpath index 9165cb465..aa25c80eb 100644 --- a/org.eclipse.tm4e.languageconfiguration/.classpath +++ b/org.eclipse.tm4e.languageconfiguration/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.tm4e.languageconfiguration/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.tm4e.languageconfiguration/.settings/org.eclipse.jdt.core.prefs index a49659d2c..543db3986 100644 --- a/org.eclipse.tm4e.languageconfiguration/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.tm4e.languageconfiguration/.settings/org.eclipse.jdt.core.prefs @@ -14,9 +14,9 @@ org.eclipse.jdt.core.compiler.annotation.owning=org.eclipse.jdt.annotation.Ownin org.eclipse.jdt.core.compiler.annotation.resourceanalysis=disabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.compliance=21 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -134,7 +134,7 @@ org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=17 +org.eclipse.jdt.core.compiler.source=21 org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647 org.eclipse.jdt.core.formatter.align_selector_in_method_invocation_on_expression_first_line=false diff --git a/org.eclipse.tm4e.languageconfiguration/META-INF/MANIFEST.MF b/org.eclipse.tm4e.languageconfiguration/META-INF/MANIFEST.MF index 767d776de..807b36d8d 100644 --- a/org.eclipse.tm4e.languageconfiguration/META-INF/MANIFEST.MF +++ b/org.eclipse.tm4e.languageconfiguration/META-INF/MANIFEST.MF @@ -4,8 +4,8 @@ Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-Localization: plugin Bundle-SymbolicName: org.eclipse.tm4e.languageconfiguration;singleton:=true -Bundle-Version: 0.15.2.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-Version: 0.16.0.qualifier +Bundle-RequiredExecutionEnvironment: JavaSE-21 Require-Bundle: org.eclipse.core.expressions, org.eclipse.core.filebuffers, org.eclipse.core.filesystem, @@ -17,9 +17,9 @@ Require-Bundle: org.eclipse.core.expressions, org.eclipse.ui.genericeditor, org.eclipse.ui.ide, org.eclipse.e4.ui.css.swt.theme, - org.eclipse.tm4e.registry;bundle-version="0.15.2", - org.eclipse.tm4e.core;bundle-version="0.15.2", - org.eclipse.tm4e.ui;bundle-version="0.15.2", + org.eclipse.tm4e.registry;bundle-version="0.16.0", + org.eclipse.tm4e.core;bundle-version="0.16.0", + org.eclipse.tm4e.ui;bundle-version="0.16.0", com.google.gson;bundle-version="[2.10.1,3.0.0)" Bundle-Activator: org.eclipse.tm4e.languageconfiguration.LanguageConfigurationPlugin Export-Package: org.eclipse.tm4e.languageconfiguration, diff --git a/org.eclipse.tm4e.languageconfiguration/pom.xml b/org.eclipse.tm4e.languageconfiguration/pom.xml index c2bdfee75..c3ac4924a 100644 --- a/org.eclipse.tm4e.languageconfiguration/pom.xml +++ b/org.eclipse.tm4e.languageconfiguration/pom.xml @@ -5,7 +5,7 @@ org.eclipse org.eclipse.tm4e - 0.15.2-SNAPSHOT + 0.16.0-SNAPSHOT org.eclipse.tm4e.languageconfiguration diff --git a/org.eclipse.tm4e.markdown/.classpath b/org.eclipse.tm4e.markdown/.classpath index 6ab27de0b..c20bebf62 100644 --- a/org.eclipse.tm4e.markdown/.classpath +++ b/org.eclipse.tm4e.markdown/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.tm4e.markdown/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.tm4e.markdown/.settings/org.eclipse.jdt.core.prefs index a49659d2c..543db3986 100644 --- a/org.eclipse.tm4e.markdown/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.tm4e.markdown/.settings/org.eclipse.jdt.core.prefs @@ -14,9 +14,9 @@ org.eclipse.jdt.core.compiler.annotation.owning=org.eclipse.jdt.annotation.Ownin org.eclipse.jdt.core.compiler.annotation.resourceanalysis=disabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.compliance=21 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -134,7 +134,7 @@ org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=17 +org.eclipse.jdt.core.compiler.source=21 org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647 org.eclipse.jdt.core.formatter.align_selector_in_method_invocation_on_expression_first_line=false diff --git a/org.eclipse.tm4e.markdown/META-INF/MANIFEST.MF b/org.eclipse.tm4e.markdown/META-INF/MANIFEST.MF index 17fbabae4..9d1949d4d 100644 --- a/org.eclipse.tm4e.markdown/META-INF/MANIFEST.MF +++ b/org.eclipse.tm4e.markdown/META-INF/MANIFEST.MF @@ -4,12 +4,12 @@ Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-Localization: plugin Bundle-SymbolicName: org.eclipse.tm4e.markdown;singleton:=true -Bundle-Version: 0.15.2.qualifier +Bundle-Version: 0.16.0.qualifier Require-Bundle: org.eclipse.core.runtime, - org.eclipse.tm4e.core;bundle-version="0.15.2", - org.eclipse.tm4e.registry;bundle-version="0.15.2", - org.eclipse.tm4e.ui;bundle-version="0.15.2" -Bundle-RequiredExecutionEnvironment: JavaSE-17 + org.eclipse.tm4e.core;bundle-version="0.16.0", + org.eclipse.tm4e.registry;bundle-version="0.16.0", + org.eclipse.tm4e.ui;bundle-version="0.16.0" +Bundle-RequiredExecutionEnvironment: JavaSE-21 Export-Package: org.eclipse.tm4e.markdown, org.eclipse.tm4e.markdown.marked Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.tm4e.markdown/pom.xml b/org.eclipse.tm4e.markdown/pom.xml index 4140f2e24..687a697c5 100644 --- a/org.eclipse.tm4e.markdown/pom.xml +++ b/org.eclipse.tm4e.markdown/pom.xml @@ -5,7 +5,7 @@ org.eclipse org.eclipse.tm4e - 0.15.2-SNAPSHOT + 0.16.0-SNAPSHOT org.eclipse.tm4e.markdown diff --git a/org.eclipse.tm4e.registry/.classpath b/org.eclipse.tm4e.registry/.classpath index 6ab27de0b..c20bebf62 100644 --- a/org.eclipse.tm4e.registry/.classpath +++ b/org.eclipse.tm4e.registry/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.tm4e.registry/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.tm4e.registry/.settings/org.eclipse.jdt.core.prefs index a49659d2c..543db3986 100644 --- a/org.eclipse.tm4e.registry/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.tm4e.registry/.settings/org.eclipse.jdt.core.prefs @@ -14,9 +14,9 @@ org.eclipse.jdt.core.compiler.annotation.owning=org.eclipse.jdt.annotation.Ownin org.eclipse.jdt.core.compiler.annotation.resourceanalysis=disabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.compliance=21 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -134,7 +134,7 @@ org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=17 +org.eclipse.jdt.core.compiler.source=21 org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647 org.eclipse.jdt.core.formatter.align_selector_in_method_invocation_on_expression_first_line=false diff --git a/org.eclipse.tm4e.registry/META-INF/MANIFEST.MF b/org.eclipse.tm4e.registry/META-INF/MANIFEST.MF index 684bdb2e1..5ed666daa 100644 --- a/org.eclipse.tm4e.registry/META-INF/MANIFEST.MF +++ b/org.eclipse.tm4e.registry/META-INF/MANIFEST.MF @@ -3,11 +3,11 @@ Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-SymbolicName: org.eclipse.tm4e.registry;singleton:=true -Bundle-Version: 0.15.2.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-Version: 0.16.0.qualifier +Bundle-RequiredExecutionEnvironment: JavaSE-21 Require-Bundle: org.eclipse.core.runtime, org.eclipse.equinox.preferences, - org.eclipse.tm4e.core;bundle-version="0.15.2", + org.eclipse.tm4e.core;bundle-version="0.16.0", com.google.gson;bundle-version="[2.13.1,3.0.0)" Export-Package: org.eclipse.tm4e.registry Bundle-Activator: org.eclipse.tm4e.registry.TMEclipseRegistryPlugin diff --git a/org.eclipse.tm4e.registry/pom.xml b/org.eclipse.tm4e.registry/pom.xml index 0b034698f..8891b121f 100644 --- a/org.eclipse.tm4e.registry/pom.xml +++ b/org.eclipse.tm4e.registry/pom.xml @@ -5,7 +5,7 @@ org.eclipse org.eclipse.tm4e - 0.15.2-SNAPSHOT + 0.16.0-SNAPSHOT org.eclipse.tm4e.registry diff --git a/org.eclipse.tm4e.repository/pom.xml b/org.eclipse.tm4e.repository/pom.xml index cf543f56e..81fe0ed5a 100644 --- a/org.eclipse.tm4e.repository/pom.xml +++ b/org.eclipse.tm4e.repository/pom.xml @@ -5,7 +5,7 @@ org.eclipse org.eclipse.tm4e - 0.15.2-SNAPSHOT + 0.16.0-SNAPSHOT org.eclipse.tm4e.repository diff --git a/org.eclipse.tm4e.samples/.classpath b/org.eclipse.tm4e.samples/.classpath index 9165cb465..aa25c80eb 100644 --- a/org.eclipse.tm4e.samples/.classpath +++ b/org.eclipse.tm4e.samples/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.tm4e.samples/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.tm4e.samples/.settings/org.eclipse.jdt.core.prefs index 37f829283..42ea09faa 100644 --- a/org.eclipse.tm4e.samples/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.tm4e.samples/.settings/org.eclipse.jdt.core.prefs @@ -11,9 +11,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable.secondary= org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.compliance=21 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -129,7 +129,7 @@ org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=17 +org.eclipse.jdt.core.compiler.source=21 org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647 org.eclipse.jdt.core.formatter.align_selector_in_method_invocation_on_expression_first_line=false diff --git a/org.eclipse.tm4e.samples/META-INF/MANIFEST.MF b/org.eclipse.tm4e.samples/META-INF/MANIFEST.MF index ba3638095..831dcd697 100644 --- a/org.eclipse.tm4e.samples/META-INF/MANIFEST.MF +++ b/org.eclipse.tm4e.samples/META-INF/MANIFEST.MF @@ -4,15 +4,15 @@ Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-Localization: plugin Bundle-SymbolicName: org.eclipse.tm4e.samples;singleton:=true -Bundle-Version: 0.15.2.qualifier +Bundle-Version: 0.16.0.qualifier Require-Bundle: org.eclipse.jface.text, org.eclipse.core.runtime, org.eclipse.ui, org.eclipse.ui.editors, org.eclipse.ui.genericeditor;bundle-version="1.0.0";resolution:=optional, - org.eclipse.tm4e.core;bundle-version="0.15.2", - org.eclipse.tm4e.ui;bundle-version="0.15.2" -Bundle-RequiredExecutionEnvironment: JavaSE-17 + org.eclipse.tm4e.core;bundle-version="0.16.0", + org.eclipse.tm4e.ui;bundle-version="0.16.0" +Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-ActivationPolicy: lazy Automatic-Module-Name: org.eclipse.tm4e.samples diff --git a/org.eclipse.tm4e.samples/pom.xml b/org.eclipse.tm4e.samples/pom.xml index 9e76fc2df..1bbb8c481 100644 --- a/org.eclipse.tm4e.samples/pom.xml +++ b/org.eclipse.tm4e.samples/pom.xml @@ -4,7 +4,7 @@ org.eclipse org.eclipse.tm4e - 0.15.2-SNAPSHOT + 0.16.0-SNAPSHOT org.eclipse.tm4e.samples diff --git a/org.eclipse.tm4e.ui.tests/.classpath b/org.eclipse.tm4e.ui.tests/.classpath index 55bce8855..9ef9a2055 100644 --- a/org.eclipse.tm4e.ui.tests/.classpath +++ b/org.eclipse.tm4e.ui.tests/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.tm4e.ui.tests/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.tm4e.ui.tests/.settings/org.eclipse.jdt.core.prefs index 37f829283..42ea09faa 100644 --- a/org.eclipse.tm4e.ui.tests/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.tm4e.ui.tests/.settings/org.eclipse.jdt.core.prefs @@ -11,9 +11,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable.secondary= org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.compliance=21 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -129,7 +129,7 @@ org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=17 +org.eclipse.jdt.core.compiler.source=21 org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647 org.eclipse.jdt.core.formatter.align_selector_in_method_invocation_on_expression_first_line=false diff --git a/org.eclipse.tm4e.ui.tests/META-INF/MANIFEST.MF b/org.eclipse.tm4e.ui.tests/META-INF/MANIFEST.MF index f191a79d2..ba24a01b1 100644 --- a/org.eclipse.tm4e.ui.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.tm4e.ui.tests/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-Localization: plugin Bundle-SymbolicName: org.eclipse.tm4e.ui.tests;singleton:=true -Bundle-Version: 0.15.2.qualifier +Bundle-Version: 0.16.0.qualifier Require-Bundle: org.eclipse.jface.text, org.eclipse.core.filesystem, org.eclipse.core.resources, @@ -18,7 +18,7 @@ Require-Bundle: org.eclipse.jface.text, org.eclipse.tm4e.registry, org.eclipse.tm4e.ui, assertj-core -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-ActivationPolicy: lazy Import-Package: org.junit.jupiter.api, org.junit.jupiter.api.condition, diff --git a/org.eclipse.tm4e.ui.tests/pom.xml b/org.eclipse.tm4e.ui.tests/pom.xml index a4da4ee85..e0be93171 100644 --- a/org.eclipse.tm4e.ui.tests/pom.xml +++ b/org.eclipse.tm4e.ui.tests/pom.xml @@ -5,7 +5,7 @@ org.eclipse org.eclipse.tm4e - 0.15.2-SNAPSHOT + 0.16.0-SNAPSHOT org.eclipse.tm4e.ui.tests diff --git a/org.eclipse.tm4e.ui/.classpath b/org.eclipse.tm4e.ui/.classpath index 9165cb465..aa25c80eb 100644 --- a/org.eclipse.tm4e.ui/.classpath +++ b/org.eclipse.tm4e.ui/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.tm4e.ui/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.tm4e.ui/.settings/org.eclipse.jdt.core.prefs index a49659d2c..543db3986 100644 --- a/org.eclipse.tm4e.ui/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.tm4e.ui/.settings/org.eclipse.jdt.core.prefs @@ -14,9 +14,9 @@ org.eclipse.jdt.core.compiler.annotation.owning=org.eclipse.jdt.annotation.Ownin org.eclipse.jdt.core.compiler.annotation.resourceanalysis=disabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.compliance=21 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -134,7 +134,7 @@ org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=17 +org.eclipse.jdt.core.compiler.source=21 org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647 org.eclipse.jdt.core.formatter.align_selector_in_method_invocation_on_expression_first_line=false diff --git a/org.eclipse.tm4e.ui/META-INF/MANIFEST.MF b/org.eclipse.tm4e.ui/META-INF/MANIFEST.MF index 24406f9f3..4897ced8c 100644 --- a/org.eclipse.tm4e.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.tm4e.ui/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-Localization: plugin Bundle-SymbolicName: org.eclipse.tm4e.ui;singleton:=true -Bundle-Version: 0.15.2.qualifier +Bundle-Version: 0.16.0.qualifier Require-Bundle: org.eclipse.core.expressions, org.eclipse.core.filesystem, org.eclipse.core.resources, @@ -16,10 +16,10 @@ Require-Bundle: org.eclipse.core.expressions, org.eclipse.ui.trace;resolution:=optional, org.eclipse.ui.workbench.texteditor, org.eclipse.e4.ui.css.swt.theme, - org.eclipse.tm4e.core;bundle-version="0.15.2", - org.eclipse.tm4e.registry;bundle-version="0.15.2", + org.eclipse.tm4e.core;bundle-version="0.16.0", + org.eclipse.tm4e.registry;bundle-version="0.16.0", com.google.gson;bundle-version="[2.13.1,3.0.0)" -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Export-Package: org.eclipse.tm4e.ui, org.eclipse.tm4e.ui.internal.model;x-friends:="org.eclipse.tm4e.languageconfiguration,org.eclipse.tm4e.ui.tests", org.eclipse.tm4e.ui.internal.themes;x-friends:="org.eclipse.tm4e.ui.tests", diff --git a/org.eclipse.tm4e.ui/pom.xml b/org.eclipse.tm4e.ui/pom.xml index 101044512..df0d8b28e 100644 --- a/org.eclipse.tm4e.ui/pom.xml +++ b/org.eclipse.tm4e.ui/pom.xml @@ -5,7 +5,7 @@ org.eclipse org.eclipse.tm4e - 0.15.2-SNAPSHOT + 0.16.0-SNAPSHOT org.eclipse.tm4e.ui diff --git a/pom.xml b/pom.xml index a5944b7f6..5b6a13fc9 100644 --- a/pom.xml +++ b/pom.xml @@ -5,13 +5,13 @@ org.eclipse org.eclipse.tm4e - 0.15.2-SNAPSHOT + 0.16.0-SNAPSHOT pom UTF-8 3.9.5 - 17 + 21 5.0.0 ../target/jacoco.exec scm:git:https://github.com/eclipse-tm4e/tm4e.git diff --git a/target-platforms/oldest.target b/target-platforms/oldest.target index 9aabd0c31..acb269eaf 100644 --- a/target-platforms/oldest.target +++ b/target-platforms/oldest.target @@ -8,7 +8,7 @@ - + @@ -37,5 +37,5 @@ - + From ac470404d3f102810288354197d086e65dae407b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 13 Oct 2025 11:43:10 +0000 Subject: [PATCH 15/21] fix(deps): bump com.vegardit.no-npe:no-npe-eea-all from 1.3.6 to 1.3.7 Bumps [com.vegardit.no-npe:no-npe-eea-all](https://github.com/vegardit/no-npe) from 1.3.6 to 1.3.7. - [Commits](https://github.com/vegardit/no-npe/compare/1.3.6...1.3.7) --- updated-dependencies: - dependency-name: com.vegardit.no-npe:no-npe-eea-all dependency-version: 1.3.7 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5b6a13fc9..0aa56e075 100644 --- a/pom.xml +++ b/pom.xml @@ -62,7 +62,7 @@ com.vegardit.no-npe no-npe-eea-all - 1.3.6 + 1.3.7 provided From 56785c3a29b9499b928315759eea7fd0160bb132 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 13 Oct 2025 12:14:20 +0000 Subject: [PATCH 16/21] fix(deps): bump org.jacoco:jacoco-maven-plugin from 0.8.13 to 0.8.14 Bumps [org.jacoco:jacoco-maven-plugin](https://github.com/jacoco/jacoco) from 0.8.13 to 0.8.14. - [Release notes](https://github.com/jacoco/jacoco/releases) - [Commits](https://github.com/jacoco/jacoco/compare/v0.8.13...v0.8.14) --- updated-dependencies: - dependency-name: org.jacoco:jacoco-maven-plugin dependency-version: 0.8.14 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0aa56e075..e62006433 100644 --- a/pom.xml +++ b/pom.xml @@ -284,7 +284,7 @@ org.jacoco jacoco-maven-plugin - 0.8.13 + 0.8.14 prepare-agent From c85e71edf2b06009c3b7d000512610bf22e02bd0 Mon Sep 17 00:00:00 2001 From: sebthom Date: Mon, 13 Oct 2025 14:27:36 +0200 Subject: [PATCH 17/21] build(deps): bump snakeyaml-engine from 2.9 to 2.10 --- org.eclipse.tm4e.core/META-INF/MANIFEST.MF | 2 +- target-platforms/oldest.target | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/org.eclipse.tm4e.core/META-INF/MANIFEST.MF b/org.eclipse.tm4e.core/META-INF/MANIFEST.MF index e22bc277a..eb2af719a 100644 --- a/org.eclipse.tm4e.core/META-INF/MANIFEST.MF +++ b/org.eclipse.tm4e.core/META-INF/MANIFEST.MF @@ -10,7 +10,7 @@ Require-Bundle: com.google.gson;bundle-version="[2.13.1,3.0.0)", org.apache.batik.util;bundle-version="[1.19.0,2.0.0)", org.jcodings;bundle-version="[1.0.63,2.0.0)", org.joni;bundle-version="[2.2.6,3.0.0)", - org.snakeyaml.engine;bundle-version="[2.9.0,3.0.0)" + org.snakeyaml.engine;bundle-version="[2.10.0,3.0.0)" Import-Package: org.w3c.css.sac, org.w3c.css.sac.helpers, org.w3c.dom.css diff --git a/target-platforms/oldest.target b/target-platforms/oldest.target index acb269eaf..156632d20 100644 --- a/target-platforms/oldest.target +++ b/target-platforms/oldest.target @@ -19,7 +19,7 @@ - + From 91e10e983930e637db92f287113a0f3dc211866e Mon Sep 17 00:00:00 2001 From: sebthom Date: Mon, 13 Oct 2025 20:24:30 +0200 Subject: [PATCH 18/21] fix: URL constructor deprecation warning as of Java 21 --- .../src/main/java/updater/AbstractSourceHandler.java | 12 ++++++------ .../java/org/eclipse/tm4e/registry/TMResource.java | 7 +++---- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/org.eclipse.tm4e.language_pack/updater/src/main/java/updater/AbstractSourceHandler.java b/org.eclipse.tm4e.language_pack/updater/src/main/java/updater/AbstractSourceHandler.java index 3aee68426..3075face5 100644 --- a/org.eclipse.tm4e.language_pack/updater/src/main/java/updater/AbstractSourceHandler.java +++ b/org.eclipse.tm4e.language_pack/updater/src/main/java/updater/AbstractSourceHandler.java @@ -16,11 +16,11 @@ import static updater.utils.Validation.isURL; import java.io.IOException; -import java.net.URL; +import java.net.URI; import java.nio.file.Files; import java.nio.file.Path; import java.util.Map; -import java.util.function.Function; +import java.util.function.UnaryOperator; import javax.xml.XMLConstants; import javax.xml.parsers.DocumentBuilderFactory; @@ -59,7 +59,7 @@ record DownloadContext(String targetNamePrefix, boolean updateExistingFiles, Pat void downloadExampleFile(final DownloadContext ctx, final String examplePathOrURL) throws IOException { if (examplePathOrURL != null) { if (isURL(examplePathOrURL)) { - final var sourceURL = new URL(examplePathOrURL); + final var sourceURL = URI.create(examplePathOrURL).toURL(); final var targetFile = ctx.targetDir.resolve(ctx.targetNamePrefix + ".example." + getFileExtension(sourceURL.getPath())); if (ctx.updateExistingFiles || !Files.exists(targetFile)) { downloadFile(sourceURL, targetFile); @@ -79,7 +79,7 @@ void downloadLangConfigurationJSONFile(final DownloadContext ctx, final String l if (isURL(langCfgPathOrURL)) { final var targetFile = ctx.targetDir.resolve(ctx.targetNamePrefix + ".language-configuration.json"); if (ctx.updateExistingFiles || !Files.exists(targetFile)) { - downloadFile(new URL(langCfgPathOrURL), targetFile); + downloadFile(URI.create(langCfgPathOrURL).toURL(), targetFile); } } else { final var targetFile = ctx.targetDir.resolve(ctx.targetNamePrefix + ".language-configuration.json"); @@ -112,7 +112,7 @@ void downloadLicenseFile(final Path targetDir) throws IOException { * @return grammarFile */ Path downloadTextMateGrammarFile(final DownloadContext ctx, final String grammarPathOrURL) throws IOException { - final Function mapFileExt = fileExt -> switch (fileExt) { + final UnaryOperator mapFileExt = fileExt -> switch (fileExt) { case "json" -> ".tmLanguage.json"; case "yml", "yaml", "yaml-tmlanguage" -> ".tmLanguage.yaml"; case "plist", "xml", "tmlanguage" -> ".tmLanguage.plist"; @@ -120,7 +120,7 @@ Path downloadTextMateGrammarFile(final DownloadContext ctx, final String grammar }; if (isURL(grammarPathOrURL)) { - final var sourceURL = new URL(grammarPathOrURL); + final var sourceURL = URI.create(grammarPathOrURL).toURL(); final var targetFile = ctx.targetDir.resolve(ctx.targetNamePrefix + mapFileExt.apply(getFileExtension(sourceURL.getPath()) .toLowerCase())); if (ctx.updateExistingFiles || !Files.exists(targetFile)) { diff --git a/org.eclipse.tm4e.registry/src/main/java/org/eclipse/tm4e/registry/TMResource.java b/org.eclipse.tm4e.registry/src/main/java/org/eclipse/tm4e/registry/TMResource.java index 7c3a7cc9b..c2aad4c0c 100644 --- a/org.eclipse.tm4e.registry/src/main/java/org/eclipse/tm4e/registry/TMResource.java +++ b/org.eclipse.tm4e.registry/src/main/java/org/eclipse/tm4e/registry/TMResource.java @@ -17,7 +17,6 @@ import java.io.IOException; import java.io.InputStream; import java.net.URI; -import java.net.URL; import java.nio.charset.StandardCharsets; import org.eclipse.core.runtime.FileLocator; @@ -43,7 +42,7 @@ protected TMResource() { protected TMResource(final IConfigurationElement ce) { this(ce.getAttribute(XMLConstants.PATH_ATTR)); - this.pluginId = ce.getNamespaceIdentifier(); + pluginId = ce.getNamespaceIdentifier(); } protected TMResource(final String path) { @@ -77,7 +76,7 @@ public URI getURI() { public InputStream getInputStream() throws IOException { return new BufferedInputStream(pluginId == null ? new FileInputStream(new File(path)) - : new URL(PLATFORM_PLUGIN + pluginId + '/' + path).openStream()); + : URI.create(PLATFORM_PLUGIN + pluginId + '/' + path).toURL().openStream()); } @Override @@ -85,7 +84,7 @@ public long getLastModified() { try { return new File(pluginId == null // ? path - : FileLocator.resolve(new URL(PLATFORM_PLUGIN + pluginId + '/' + path)).getFile() // + : FileLocator.resolve(URI.create(PLATFORM_PLUGIN + pluginId + '/' + path).toURL()).getFile() // ).lastModified(); } catch (final IOException ex) { return 0; From 504af595848c6c407030c917eb6f75e64e7643f0 Mon Sep 17 00:00:00 2001 From: sebthom Date: Mon, 13 Oct 2025 20:43:19 +0200 Subject: [PATCH 19/21] refact: minor code cleanup --- .../core/internal/oniguruma/OnigRegExp.java | 18 +++++------ .../tm4e/core/grammar/GrammarTest.java | 32 +++++++++---------- ...uageConfigurationCharacterPairMatcher.java | 2 +- ...SelectLanguageConfigurationWizardPage.java | 20 ++++-------- 4 files changed, 32 insertions(+), 40 deletions(-) diff --git a/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/internal/oniguruma/OnigRegExp.java b/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/internal/oniguruma/OnigRegExp.java index 0170b2e94..96f11a6fc 100644 --- a/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/internal/oniguruma/OnigRegExp.java +++ b/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/internal/oniguruma/OnigRegExp.java @@ -85,8 +85,9 @@ public OnigRegExp(final String pattern, final boolean ignoreCase) { private Regex parsePattern(final String pattern, final boolean ignoreCase) throws SyntaxException { int options = Option.CAPTURE_GROUP; - if (ignoreCase) + if (ignoreCase) { options |= Option.IGNORECASE; + } final byte[] patternBytes = pattern.getBytes(StandardCharsets.UTF_8); return new Regex(patternBytes, 0, patternBytes.length, options, NonStrictUTF8Encoding.INSTANCE, Syntax.RUBY, LOGGER.isLoggable(Level.WARNING) ? LOGGER_WARN_CALLBACK : WarnCallback.NONE); @@ -209,7 +210,6 @@ private boolean isFixedLength(final String body) { } catch (final NumberFormatException e) { return false; } - int n = m; if (j < body.length() && body.charAt(j) == ',') { j++; int k = j; @@ -219,12 +219,12 @@ private boolean isFixedLength(final String body) { if (k == j) return false; // {m,} try { - n = Integer.parseInt(body.substring(j, k)); + final int n = Integer.parseInt(body.substring(j, k)); + if (m != n) + return false; // {m,n} with m != n } catch (final NumberFormatException e) { return false; } - if (m != n) - return false; // {m,n} with m != n j = k; } final int close = body.indexOf('}', j); @@ -240,18 +240,16 @@ private boolean isFixedLength(final String body) { * @return null if not found */ public @Nullable OnigResult search(final OnigString str, final int startPosition) { - if (hasGAnchor) { + if (hasGAnchor) // Should not use caching, because the regular expression // targets the current search position (\G) return search(str.bytesUTF8, startPosition, str.bytesCount); - } - final var lastSearchResult0 = this.lastSearchResult; + final var lastSearchResult0 = lastSearchResult; if (lastSearchString == str && lastSearchPosition <= startPosition - && (lastSearchResult0 == null || lastSearchResult0.locationAt(0) >= startPosition)) { + && (lastSearchResult0 == null || lastSearchResult0.locationAt(0) >= startPosition)) return lastSearchResult0; - } lastSearchString = str; lastSearchPosition = startPosition; diff --git a/org.eclipse.tm4e.core/src/test/java/org/eclipse/tm4e/core/grammar/GrammarTest.java b/org.eclipse.tm4e.core/src/test/java/org/eclipse/tm4e/core/grammar/GrammarTest.java index 99b01ff78..2c3d790ac 100644 --- a/org.eclipse.tm4e.core/src/test/java/org/eclipse/tm4e/core/grammar/GrammarTest.java +++ b/org.eclipse.tm4e.core/src/test/java/org/eclipse/tm4e/core/grammar/GrammarTest.java @@ -85,25 +85,25 @@ void testTokenizeConcurrent() throws Exception { final int numThreads = 4; final int numIterations = 10; - final var executor = Executors.newFixedThreadPool(numThreads); - final Runnable tokenizationTask = () -> { - for (int i = 0; i < numIterations; i++) { - final var r = TokenizationUtils.tokenizeText(content, grammar); - assertThat(r.count()).isGreaterThan(10); - } - }; + try (final var executor = Executors.newFixedThreadPool(numThreads)) { + final Runnable tokenizationTask = () -> { + for (int i = 0; i < numIterations; i++) { + final var r = TokenizationUtils.tokenizeText(content, grammar); + assertThat(r.count()).isGreaterThan(10); + } + }; - final List> futures = new ArrayList<>(); - for (int i = 0; i < numThreads; i++) { - futures.add(executor.submit(tokenizationTask)); - } + final List> futures = new ArrayList<>(); + for (int i = 0; i < numThreads; i++) { + futures.add(executor.submit(tokenizationTask)); + } - for (final Future future : futures) { - future.get(); + for (final Future future : futures) { + future.get(); + } + executor.shutdown(); + executor.awaitTermination(1, TimeUnit.MINUTES); } - - executor.shutdown(); - executor.awaitTermination(1, TimeUnit.MINUTES); } @Test diff --git a/org.eclipse.tm4e.languageconfiguration/src/main/java/org/eclipse/tm4e/languageconfiguration/internal/LanguageConfigurationCharacterPairMatcher.java b/org.eclipse.tm4e.languageconfiguration/src/main/java/org/eclipse/tm4e/languageconfiguration/internal/LanguageConfigurationCharacterPairMatcher.java index ac85f38f5..5205d0092 100644 --- a/org.eclipse.tm4e.languageconfiguration/src/main/java/org/eclipse/tm4e/languageconfiguration/internal/LanguageConfigurationCharacterPairMatcher.java +++ b/org.eclipse.tm4e.languageconfiguration/src/main/java/org/eclipse/tm4e/languageconfiguration/internal/LanguageConfigurationCharacterPairMatcher.java @@ -31,7 +31,7 @@ public class LanguageConfigurationCharacterPairMatcher implements ICharacterPairMatcher, ICharacterPairMatcherExtension { - private static DefaultCharacterPairMatcher NOOP_MATCHER = new DefaultCharacterPairMatcher(new char[0]); + private static final DefaultCharacterPairMatcher NOOP_MATCHER = new DefaultCharacterPairMatcher(new char[0]); private @Nullable DefaultCharacterPairMatcher matcher; private @Nullable IDocument document; diff --git a/org.eclipse.tm4e.languageconfiguration/src/main/java/org/eclipse/tm4e/languageconfiguration/internal/wizards/SelectLanguageConfigurationWizardPage.java b/org.eclipse.tm4e.languageconfiguration/src/main/java/org/eclipse/tm4e/languageconfiguration/internal/wizards/SelectLanguageConfigurationWizardPage.java index 5f784e789..0dc237b6b 100644 --- a/org.eclipse.tm4e.languageconfiguration/src/main/java/org/eclipse/tm4e/languageconfiguration/internal/wizards/SelectLanguageConfigurationWizardPage.java +++ b/org.eclipse.tm4e.languageconfiguration/src/main/java/org/eclipse/tm4e/languageconfiguration/internal/wizards/SelectLanguageConfigurationWizardPage.java @@ -195,9 +195,8 @@ private void createContentTypeTreeViewer(final Composite composite) { data.horizontalSpan = 2; contentTypesViewer.getControl().setLayoutData(data); - contentTypesViewer.addSelectionChangedListener(event -> { - contentTypeText.setText(event.getStructuredSelection().getFirstElement() instanceof IContentType ct ? ct.toString() : ""); - }); + contentTypesViewer.addSelectionChangedListener(event -> contentTypeText + .setText(event.getStructuredSelection().getFirstElement() instanceof final IContentType ct ? ct.toString() : "")); } private static final class ContentTypesLabelProvider extends LabelProvider { @@ -260,39 +259,34 @@ private Text createText(final Composite parent, final String s) { infoWidget.refresh(null); final String path = fileText.getText(); - if (path.isEmpty()) { + if (path.isEmpty()) return new Status(IStatus.ERROR, LanguageConfigurationPlugin.PLUGIN_ID, SelectLanguageConfigurationWizardPage_fileError_noSelection); - } IPath p = new Path(path); if (!p.isAbsolute()) { p = castNonNull(ResourcesPlugin.getWorkspace().getRoot().getFile(p).getLocation()); } try (var file = new FileReader(p.toFile())) { final var configuration = LanguageConfiguration.load(file); - if (configuration == null) { + if (configuration == null) return new Status(IStatus.ERROR, LanguageConfigurationPlugin.PLUGIN_ID, SelectLanguageConfigurationWizardPage_fileError_invalid); - } infoWidget.refresh(configuration); } catch (final Exception e) { return new Status(IStatus.ERROR, LanguageConfigurationPlugin.PLUGIN_ID, SelectLanguageConfigurationWizardPage_fileError_error + e.getLocalizedMessage()); } - if (contentTypeText.getText().isEmpty()) { + if (contentTypeText.getText().isEmpty()) return new Status(IStatus.ERROR, LanguageConfigurationPlugin.PLUGIN_ID, SelectLanguageConfigurationWizardPage_contentTypeError_noSelection); - } final var contentType = ContentTypeHelper.getContentTypeById(contentTypeText.getText()); - if (contentType == null) { + if (contentType == null) return new Status(IStatus.ERROR, LanguageConfigurationPlugin.PLUGIN_ID, SelectLanguageConfigurationWizardPage_contentTypeError_invalid); - } - if (registryManager.getLanguageConfigurationFor(contentType) != null) { + if (registryManager.getLanguageConfigurationFor(contentType) != null) return new Status(IStatus.WARNING, LanguageConfigurationPlugin.PLUGIN_ID, SelectLanguageConfigurationWizardPage_contentTypeWarning_duplicate); - } return null; } From 065b608a5110f162161434c939d8216ef8c1cb5e Mon Sep 17 00:00:00 2001 From: sebthom Date: Mon, 13 Oct 2025 20:48:58 +0200 Subject: [PATCH 20/21] build: test on macos-latest GHA runner --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f8eb0a97c..817ea74d0 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -65,7 +65,7 @@ jobs: os: # https://github.com/actions/runner-images#available-images - ubuntu-latest - macos-13 # Intel - - macos-14 # ARM + - macos-latest # ARM - windows-latest target-platform: - oldest From 081481eddbef455b46bddbbe4546acfea3a25f0c Mon Sep 17 00:00:00 2001 From: sebthom Date: Mon, 13 Oct 2025 22:20:59 +0200 Subject: [PATCH 21/21] build: remove source features deprecated in tycho 5 --- org.eclipse.tm4e.repository/category.xml | 7 ------- org.eclipse.tm4e.repository/pom.xml | 15 +++++++++++++++ pom.xml | 7 ------- 3 files changed, 15 insertions(+), 14 deletions(-) diff --git a/org.eclipse.tm4e.repository/category.xml b/org.eclipse.tm4e.repository/category.xml index 4b1ce9047..e4f938aeb 100644 --- a/org.eclipse.tm4e.repository/category.xml +++ b/org.eclipse.tm4e.repository/category.xml @@ -3,18 +3,12 @@ - - - - - - @@ -38,6 +32,5 @@ - diff --git a/org.eclipse.tm4e.repository/pom.xml b/org.eclipse.tm4e.repository/pom.xml index 81fe0ed5a..bf866f8d2 100644 --- a/org.eclipse.tm4e.repository/pom.xml +++ b/org.eclipse.tm4e.repository/pom.xml @@ -15,6 +15,21 @@ true + + + + + org.eclipse.tycho + tycho-p2-repository-plugin + ${tycho-version} + + + true + + + + + sign diff --git a/pom.xml b/pom.xml index e62006433..232823ce2 100644 --- a/pom.xml +++ b/pom.xml @@ -200,13 +200,6 @@ tycho-source-plugin ${tycho-version} - - feature-source - package - - feature-source - - plugin-source