Spring/spring-tools
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Switch VSCode extensions to built-in YAML java-props grammars

Browse Source
This commit is contained in:
aboyko
2023-05-09 19:57:10 -04:00
parent 7d66b171bf
commit 6d0e4587aa
26 changed files with 132 additions and 1509 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/SimpleLanguageServer.java
View File

@@ -925,7 +925,11 @@ public final class SimpleLanguageServer implements Sts4LanguageServer, SpringMod
@Override
public SpringModelService getSpringModelService() {
return (SpringModelService) appContext.getBean(SpringModelService.class);
try {
return (SpringModelService) appContext.getBean(SpringModelService.class);
} catch (Throwable e) {
return null;
}
}
}

2
vscode-extensions/vscode-bosh/.vscode/settings.json vendored
View File

@@ -1,6 +1,6 @@
// Place your settings in this file to overwrite default and user settings.
{
"editor.wordWrap": false,
"editor.wordWrap": "off",
"files.exclude": {
"out": false, // set this to true to hide the "out" folder with the compiled JS files
"node_modules": false,

27
vscode-extensions/vscode-bosh/.vscode/tasks.json vendored
View File

@@ -8,17 +8,11 @@
// A task runner that calls a custom npm script that compiles the extension.
{
"version": "0.1.0",
"version": "2.0.0",
// we want to run npm
"command": "npm",
// the command is a shell script
"isShellCommand": true,
// show the output window only if unrecognized errors occur.
"showOutput": "always",
// we run the custom script "compile" as defined in package.json
"args": ["run", "compile"],
@@ -26,5 +20,22 @@
"isWatching": true,
// use the standard tsc in watch mode problem matcher to find compile problems in the output.
"problemMatcher": "$tsc-watch"
"problemMatcher": "$tsc-watch",
"tasks": [
{
"label": "npm",
"type": "shell",
"command": "npm",
"args": [
"run",
"compile"
],
"isBackground": true,
"problemMatcher": "$tsc-watch",
"group": {
"_id": "build",
"isDefault": false
}
}
]
}

11
vscode-extensions/vscode-bosh/package.json
View File

@@ -35,7 +35,8 @@
],
"filenamePatterns": [
"*cloud-config*.yml"
]
],
"configuration": "./yaml-support/language-configuration.json"
},
{
"id": "bosh-deployment-manifest",
@@ -51,13 +52,13 @@
"grammars": [
{
"language": "bosh-deployment-manifest",
"scopeName": "source.yaml",
"path": "./yaml-support/yaml.tmLanguage"
"scopeName": "source.bosh-yaml",
"path": "./yaml-support/bosh-yaml.tmLanguage.json"
},
{
"language": "bosh-cloud-config",
"scopeName": "source.yaml",
"path": "./yaml-support/yaml.tmLanguage"
"scopeName": "source.bosh-yaml",
"path": "./yaml-support/bosh-yaml.tmLanguage.json"
}
],
"configuration": {

3
vscode-extensions/vscode-bosh/scripts/preinstall.sh
View File

@@ -3,9 +3,6 @@ set -e
workdir=`pwd`
# Download yaml TextMate grammar
curl https://raw.githubusercontent.com/textmate/yaml.tmbundle/master/Syntaxes/YAML.tmLanguage > yaml-support/yaml.tmLanguage
# Preinstall commons-vscode package
(cd ../commons-vscode ; npm install ; npm pack)
npm install ../commons-vscode/*-commons-vscode-*.tgz

28
vscode-extensions/vscode-bosh/yaml-support/OSSREADME.json
View File

@@ -1,28 +0,0 @@
// ATTENTION - THIS DIRECTORY CONTAINS THIRD PARTY OPEN SOURCE MATERIALS:
[{
"name": "textmate/yaml.tmbundle",
"version": "0.0.0",
"license": "TextMate Bundle License",
"repositoryURL": "https://github.com/textmate/yaml.tmbundle",
"licenseDetail": [
"Copyright (c) 2015 FichteFoll <fichtefoll2@googlemail.com>",
"",
"Permission is hereby granted, free of charge, to any person obtaining a copy",
"of this software and associated documentation files (the \"Software\"), to deal",
"in the Software without restriction, including without limitation the rights",
"to use, copy, modify, merge, publish, distribute, sublicense, and/or sell",
"copies of the Software, and to permit persons to whom the Software is",
"furnished to do so, subject to the following conditions:",
"",
"The above copyright notice and this permission notice shall be included in all",
"copies or substantial portions of the Software.",
"",
"THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR",
"IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,",
"FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE",
"AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER",
"LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,",
"OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE."
]
}]

10
vscode-extensions/vscode-bosh/yaml-support/bosh-yaml.tmLanguage.json Normal file
View File

@@ -0,0 +1,10 @@
{
"name": "Bosh YAML",
"scopeName": "source.bosh-yaml",
"patterns": [
{
"comment": "source.yaml is defined in vscode core",
"include": "source.yaml"
}
]
}

27
vscode-extensions/vscode-concourse/.vscode/tasks.json vendored
View File

@@ -8,17 +8,11 @@
// A task runner that calls a custom npm script that compiles the extension.
{
"version": "0.1.0",
"version": "2.0.0",
// we want to run npm
"command": "npm",
// the command is a shell script
"isShellCommand": true,
// show the output window only if unrecognized errors occur.
"showOutput": "always",
// we run the custom script "compile" as defined in package.json
"args": ["run", "compile"],
@@ -26,5 +20,22 @@
"isWatching": true,
// use the standard tsc in watch mode problem matcher to find compile problems in the output.
"problemMatcher": "$tsc-watch"
"problemMatcher": "$tsc-watch",
"tasks": [
{
"label": "npm",
"type": "shell",
"command": "npm",
"args": [
"run",
"compile"
],
"isBackground": true,
"problemMatcher": "$tsc-watch",
"group": {
"_id": "build",
"isDefault": false
}
}
]
}

8
vscode-extensions/vscode-concourse/package.json
View File

@@ -107,13 +107,13 @@
"grammars": [
{
"language": "concourse-pipeline-yaml",
"scopeName": "source.yaml",
"path": "./yaml-support/yaml.tmLanguage"
"scopeName": "source.concourse-yaml",
"path": "./yaml-support/concourse-yaml.tmLanguage.json"
},
{
"language": "concourse-task-yaml",
"scopeName": "source.yaml",
"path": "./yaml-support/yaml.tmLanguage"
"scopeName": "source.concourse-yaml",
"path": "./yaml-support/concourse-yaml.tmLanguage.json"
}
]
},

3
vscode-extensions/vscode-concourse/scripts/preinstall.sh
View File

@@ -3,9 +3,6 @@ set -e
workdir=`pwd`
# Download yaml TextMate grammar
curl https://raw.githubusercontent.com/textmate/yaml.tmbundle/master/Syntaxes/YAML.tmLanguage > yaml-support/yaml.tmLanguage
# Preinstall commons-vscode package
(cd ../commons-vscode ; npm install ; npm pack)
npm install ../commons-vscode/*-commons-vscode-*.tgz

28
vscode-extensions/vscode-concourse/yaml-support/OSSREADME.json
View File

@@ -1,28 +0,0 @@
// ATTENTION - THIS DIRECTORY CONTAINS THIRD PARTY OPEN SOURCE MATERIALS:
[{
"name": "textmate/yaml.tmbundle",
"version": "0.0.0",
"license": "TextMate Bundle License",
"repositoryURL": "https://github.com/textmate/yaml.tmbundle",
"licenseDetail": [
"Copyright (c) 2015 FichteFoll <fichtefoll2@googlemail.com>",
"",
"Permission is hereby granted, free of charge, to any person obtaining a copy",
"of this software and associated documentation files (the \"Software\"), to deal",
"in the Software without restriction, including without limitation the rights",
"to use, copy, modify, merge, publish, distribute, sublicense, and/or sell",
"copies of the Software, and to permit persons to whom the Software is",
"furnished to do so, subject to the following conditions:",
"",
"The above copyright notice and this permission notice shall be included in all",
"copies or substantial portions of the Software.",
"",
"THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR",
"IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,",
"FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE",
"AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER",
"LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,",
"OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE."
]
}]

10
vscode-extensions/vscode-concourse/yaml-support/concourse-yaml.tmLanguage.json Normal file
View File

@@ -0,0 +1,10 @@
{
"name": "Concourse YAML",
"scopeName": "source.concourse-yaml",
"patterns": [
{
"comment": "source.yaml is defined in vscode core",
"include": "source.yaml"
}
]
}

2
vscode-extensions/vscode-manifest-yaml/.vscode/settings.json vendored
View File

@@ -1,6 +1,6 @@
// Place your settings in this file to overwrite default and user settings.
{
"editor.wordWrap": false,
"editor.wordWrap": "off",
"files.exclude": {
"out": false, // set this to true to hide the "out" folder with the compiled JS files
"node_modules": false,

27
vscode-extensions/vscode-manifest-yaml/.vscode/tasks.json vendored
View File

@@ -8,17 +8,11 @@
// A task runner that calls a custom npm script that compiles the extension.
{
"version": "0.1.0",
"version": "2.0.0",
// we want to run npm
"command": "npm",
// the command is a shell script
"isShellCommand": true,
// show the output window only if unrecognized errors occur.
"showOutput": "always",
// we run the custom script "compile" as defined in package.json
"args": ["run", "compile"],
@@ -26,5 +20,22 @@
"isWatching": true,
// use the standard tsc in watch mode problem matcher to find compile problems in the output.
"problemMatcher": "$tsc-watch"
"problemMatcher": "$tsc-watch",
"tasks": [
{
"label": "npm",
"type": "shell",
"command": "npm",
"args": [
"run",
"compile"
],
"isBackground": true,
"problemMatcher": "$tsc-watch",
"group": {
"_id": "build",
"isDefault": false
}
}
]
}

4
vscode-extensions/vscode-manifest-yaml/package.json
View File

@@ -42,8 +42,8 @@
"grammars": [
{
"language": "manifest-yaml",
"scopeName": "source.yaml",
"path": "./yaml-support/yaml.tmLanguage"
"scopeName": "source.manifest-yaml",
"path": "./yaml-support/manifest-yaml.tmLanguage.json"
}
],
"configuration": {

3
vscode-extensions/vscode-manifest-yaml/scripts/preinstall.sh
View File

@@ -3,9 +3,6 @@ set -e
workdir=`pwd`
# Download yaml TextMate grammar
curl https://raw.githubusercontent.com/textmate/yaml.tmbundle/master/Syntaxes/YAML.tmLanguage > yaml-support/yaml.tmLanguage
# Preinstall commons-vscode package
(cd ../commons-vscode ; npm install ; npm pack)
npm install ../commons-vscode/*-commons-vscode-*.tgz

28
vscode-extensions/vscode-manifest-yaml/yaml-support/OSSREADME.json
View File

@@ -1,28 +0,0 @@
// ATTENTION - THIS DIRECTORY CONTAINS THIRD PARTY OPEN SOURCE MATERIALS:
[{
"name": "textmate/yaml.tmbundle",
"version": "0.0.0",
"license": "TextMate Bundle License",
"repositoryURL": "https://github.com/textmate/yaml.tmbundle",
"licenseDetail": [
"Copyright (c) 2015 FichteFoll <fichtefoll2@googlemail.com>",
"",
"Permission is hereby granted, free of charge, to any person obtaining a copy",
"of this software and associated documentation files (the \"Software\"), to deal",
"in the Software without restriction, including without limitation the rights",
"to use, copy, modify, merge, publish, distribute, sublicense, and/or sell",
"copies of the Software, and to permit persons to whom the Software is",
"furnished to do so, subject to the following conditions:",
"",
"The above copyright notice and this permission notice shall be included in all",
"copies or substantial portions of the Software.",
"",
"THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR",
"IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,",
"FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE",
"AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER",
"LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,",
"OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE."
]
}]

10
vscode-extensions/vscode-manifest-yaml/yaml-support/manifest-yaml.tmLanguage.json Normal file
View File

@@ -0,0 +1,10 @@
{
"name": "cloudfoundry-manifest",
"scopeName": "source.manifest-yaml",
"patterns": [
{
"comment": "source.yaml is defined in vscode core",
"include": "source.yaml"
}
]
}

12
vscode-extensions/vscode-spring-boot/package.json
View File

@@ -972,18 +972,18 @@
"grammars": [
{
"language": "spring-boot-properties-yaml",
"scopeName": "source.yaml",
"path": "./yaml-support/yaml.tmLanguage"
"scopeName": "source.spring-boot-properties-yaml",
"path": "./yaml-support/spring-boot-properties-yaml.tmLanguage.json"
},
{
"language": "spring-boot-properties",
"scopeName": "source.java-properties",
"path": "./properties-support/java-properties.tmLanguage"
"scopeName": "source.spring-boot-properties",
"path": "./properties-support/spring-boot-properties.tmLanguage.json"
},
{
"language": "spring-factories",
"scopeName": "source.java-properties",
"path": "./properties-support/java-properties.tmLanguage"
"scopeName": "source.spring-factories",
"path": "./properties-support/spring-boot-properties.tmLanguage.json"
}
]
},

13
vscode-extensions/vscode-spring-boot/properties-support/OSSREADME.json
View File

@@ -1,13 +0,0 @@
// ATTENTION - THIS DIRECTORY CONTAINS THIRD PARTY OPEN SOURCE MATERIALS:
[{
"name": "textmate/java.tmbundle",
"version": "0.0.0",
"repositoryURL": "https://github.com/textmate/java.tmbundle/blob/master/Syntaxes/JavaProperties.plist",
"licenseDetail": [
"Permission to copy, use, modify, sell and distribute this",
"software is granted. This software is provided \"as is\" without",
"express or implied warranty, and with no claim as to its",
"suitability for any purpose."
]
}]

160
vscode-extensions/vscode-spring-boot/properties-support/java-properties.tmLanguage
View File

@@ -1,160 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "https://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>fileTypes</key>
<array>
<string>properties</string>
</array>
<key>foldingStartMarker</key>
<string>^[a-zA-Z0-9.-_]+=.*\
</string>
<key>foldingStopMarker</key>
<string>^(.*(?&lt;!\)
)</string>
<key>keyEquivalent</key>
<string>^~J</string>
<key>name</key>
<string>Java Properties</string>
<key>patterns</key>
<array>
<dict>
<key>comment</key>
<string>Ignore blank lines</string>
<key>match</key>
<string>^\s*$</string>
</dict>
<dict>
<key>include</key>
<string>#comment-line</string>
</dict>
<dict>
<key>include</key>
<string>#property-name</string>
</dict>
<dict>
<key>include</key>
<string>#property-definition</string>
</dict>
</array>
<key>repository</key>
<dict>
<key>comment-line</key>
<dict>
<key>captures</key>
<dict>
<key>1</key>
<dict>
<key>name</key>
<string>punctuation.whitespace.comment.leading.java-properties</string>
</dict>
<key>2</key>
<dict>
<key>name</key>
<string>punctuation.definition.comment.java-properties</string>
</dict>
</dict>
<key>match</key>
<string>^(\s*)([#!])(.+)?$\n?</string>
<key>name</key>
<string>comment.line.java-properties</string>
</dict>
<key>property-definition</key>
<dict>
<key>begin</key>
<string>^(\s*)((?:\\[ \t]|\\:|\\=|[^:=\s])+)(?:\s*([:=]))?\s*</string>
<key>beginCaptures</key>
<dict>
<key>1</key>
<dict>
<key>name</key>
<string>punctuation.whitespace.leading.java-properties</string>
</dict>
<key>2</key>
<dict>
<key>name</key>
<string>support.identifier.java-properties</string>
<key>patterns</key>
<array>
<dict>
<key>match</key>
<string>\\(?:[ \t:=\\ntfr\"']|u[0-9A-Fa-f]{4})</string>
<key>name</key>
<string>identifier.character.escape.java-properties</string>
</dict>
</array>
</dict>
<key>3</key>
<dict>
<key>name</key>
<string>punctuation.separator.key-value.java-properties</string>
</dict>
</dict>
<key>contentName</key>
<string>string.unquoted.java-properties</string>
<key>end</key>
<string>(?&lt;!\\{1})$\n</string>
<key>name</key>
<string>meta.key-value.java-properties</string>
<key>patterns</key>
<array>
<dict>
<key>comment</key>
<string>Leading space on a continued line is ignored</string>
<key>match</key>
<string>^\s*</string>
<key>name</key>
<string>punctuation.whitespace.leading.java-properties</string>
</dict>
<dict>
<key>match</key>
<string>(\\{1})(?=$\n)</string>
<key>name</key>
<string>punctuation.separator.continuation.java-properties</string>
</dict>
<dict>
<key>match</key>
<string>\\(?:[\\ntfr\"']|u[0-9A-Fa-f]{4})</string>
<key>name</key>
<string>identifier.character.escape.java-properties</string>
</dict>
</array>
</dict>
<key>property-name</key>
<dict>
<key>captures</key>
<dict>
<key>1</key>
<dict>
<key>name</key>
<string>punctuation.whitespace.comment.leading.java-properties</string>
</dict>
<key>2</key>
<dict>
<key>name</key>
<string>support.identifier.java-properties</string>
<key>patterns</key>
<array>
<dict>
<key>match</key>
<string>\\(?:[ \t:=\\ntfr\"']|u[0-9A-Fa-f]{4})</string>
<key>name</key>
<string>identifier.character.escape.java-properties</string>
</dict>
</array>
</dict>
</dict>
<key>comment</key>
<string>A property name with no value</string>
<key>match</key>
<string>^(\s*)((?:\\[ \t]|\\:|\\=|[^:=\s])+)(?:\s*([:=]))?\s*$\n</string>
<key>name</key>
<string>meta.key-value.java-properties</string>
</dict>
</dict>
<key>scopeName</key>
<string>source.java-properties</string>
<key>uuid</key>
<string>D364E829-7643-4AFF-948D-3C0D6B4EA8A4</string>
</dict>
</plist>

10
vscode-extensions/vscode-spring-boot/properties-support/spring-boot-properties.tmLanguage.json Normal file
View File

@@ -0,0 +1,10 @@
{
"name": "Spring Boot Properties",
"scopeName": "source.spring-boot-properties",
"patterns": [
{
"comment": "source.java-properties is defined in vscode-java",
"include": "source.java-properties"
}
]
}

7
vscode-extensions/vscode-spring-boot/scripts/preinstall.sh
View File

@@ -7,13 +7,6 @@ workdir=`pwd`
(cd ../commons-vscode ; npm install ; npm pack)
npm install ../commons-vscode/*-commons-vscode-*.tgz
# Copy grammar files for .properties and .yml format
curl https://raw.githubusercontent.com/textmate/yaml.tmbundle/master/Syntaxes/YAML.tmLanguage > yaml-support/yaml.tmLanguage
sed -i -e 's/string\./identifier\./g' yaml-support/yaml.tmLanguage
curl https://raw.githubusercontent.com/textmate/java.tmbundle/master/Syntaxes/JavaProperties.plist > properties-support/java-properties.tmLanguage
sed -i -e 's/constant/identifier/g' properties-support/java-properties.tmLanguage
# Clean old jars
rm -fr ${workdir}/jars
mkdir -p ${workdir}/jars

28
vscode-extensions/vscode-spring-boot/yaml-support/OSSREADME.json
View File

@@ -1,28 +0,0 @@
// ATTENTION - THIS DIRECTORY CONTAINS THIRD PARTY OPEN SOURCE MATERIALS:
[{
"name": "textmate/yaml.tmbundle",
"version": "0.0.0",
"license": "TextMate Bundle License",
"repositoryURL": "https://github.com/textmate/yaml.tmbundle",
"licenseDetail": [
"Copyright (c) 2015 FichteFoll <fichtefoll2@googlemail.com>",
"",
"Permission is hereby granted, free of charge, to any person obtaining a copy",
"of this software and associated documentation files (the \"Software\"), to deal",
"in the Software without restriction, including without limitation the rights",
"to use, copy, modify, merge, publish, distribute, sublicense, and/or sell",
"copies of the Software, and to permit persons to whom the Software is",
"furnished to do so, subject to the following conditions:",
"",
"The above copyright notice and this permission notice shall be included in all",
"copies or substantial portions of the Software.",
"",
"THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR",
"IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,",
"FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE",
"AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER",
"LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,",
"OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE."
]
}]

10
vscode-extensions/vscode-spring-boot/yaml-support/spring-boot-properties-yaml.tmLanguage.json Normal file
View File

@@ -0,0 +1,10 @@
{
"name": "Spring Boot Properties YAML",
"scopeName": "source.spring-boot-properties-yaml",
"patterns": [
{
"comment": "source.yaml is defined in vscode core",
"include": "source.yaml"
}
]
}

1164
vscode-extensions/vscode-spring-boot/yaml-support/yaml.tmLanguage
View File

File diff suppressed because it is too large Load Diff