diff --git a/vscode-extensions/pom.xml b/vscode-extensions/pom.xml index 842ae7e1c..3e3414c8f 100644 --- a/vscode-extensions/pom.xml +++ b/vscode-extensions/pom.xml @@ -12,8 +12,6 @@ commons vscode-boot-properties - vscode-application-properties - vscode-application-yaml vscode-manifest-yaml diff --git a/vscode-extensions/vscode-application-yaml/.classpath b/vscode-extensions/vscode-application-yaml/.classpath deleted file mode 100644 index d46faf10e..000000000 --- a/vscode-extensions/vscode-application-yaml/.classpath +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/vscode-extensions/vscode-application-yaml/.gitignore b/vscode-extensions/vscode-application-yaml/.gitignore deleted file mode 100644 index 2932a75be..000000000 --- a/vscode-extensions/vscode-application-yaml/.gitignore +++ /dev/null @@ -1,11 +0,0 @@ -out -node_modules -target -*.log -*.log.* -.idea -*.iml -dependency-reduced-pom.xml -classpath.txt -*.vsix -repo \ No newline at end of file diff --git a/vscode-extensions/vscode-application-yaml/.project b/vscode-extensions/vscode-application-yaml/.project deleted file mode 100644 index e81ccc46f..000000000 --- a/vscode-extensions/vscode-application-yaml/.project +++ /dev/null @@ -1,23 +0,0 @@ - - - vscode-application-yaml - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.m2e.core.maven2Builder - - - - - - org.eclipse.jdt.core.javanature - org.eclipse.m2e.core.maven2Nature - - diff --git a/vscode-extensions/vscode-application-yaml/.settings/org.eclipse.jdt.core.prefs b/vscode-extensions/vscode-application-yaml/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 714351aec..000000000 --- a/vscode-extensions/vscode-application-yaml/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,5 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.compliance=1.8 -org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.source=1.8 diff --git a/vscode-extensions/vscode-application-yaml/.settings/org.eclipse.m2e.core.prefs b/vscode-extensions/vscode-application-yaml/.settings/org.eclipse.m2e.core.prefs deleted file mode 100644 index f897a7f1c..000000000 --- a/vscode-extensions/vscode-application-yaml/.settings/org.eclipse.m2e.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -activeProfiles= -eclipse.preferences.version=1 -resolveWorkspaceProjects=true -version=1 diff --git a/vscode-extensions/vscode-application-yaml/.vscode/launch.json b/vscode-extensions/vscode-application-yaml/.vscode/launch.json deleted file mode 100644 index 52ebf9f9e..000000000 --- a/vscode-extensions/vscode-application-yaml/.vscode/launch.json +++ /dev/null @@ -1,28 +0,0 @@ -// A launch configuration that compiles the extension and then opens it inside a new window -{ - "version": "0.1.0", - "configurations": [ - { - "name": "Launch Extension", - "type": "extensionHost", - "request": "launch", - "runtimeExecutable": "${execPath}", - "args": ["--extensionDevelopmentPath=${workspaceRoot}" ], - "stopOnEntry": false, - "sourceMaps": true, - "outDir": "${workspaceRoot}/out/lib", - "preLaunchTask": "npm" - }, - { - "name": "Launch Tests", - "type": "extensionHost", - "request": "launch", - "runtimeExecutable": "${execPath}", - "args": ["--extensionDevelopmentPath=${workspaceRoot}", "--extensionTestsPath=${workspaceRoot}/out/test" ], - "stopOnEntry": false, - "sourceMaps": true, - "outDir": "${workspaceRoot}/out/test", - "preLaunchTask": "npm" - } - ] -} diff --git a/vscode-extensions/vscode-application-yaml/.vscode/settings.json b/vscode-extensions/vscode-application-yaml/.vscode/settings.json deleted file mode 100644 index c5592bee9..000000000 --- a/vscode-extensions/vscode-application-yaml/.vscode/settings.json +++ /dev/null @@ -1,12 +0,0 @@ -// Place your settings in this file to overwrite default and user settings. -{ - "files.exclude": { - "out": true, // set this to true to hide the "out" folder with the compiled JS files - "node_modules": false, - "target": true - }, - "search.exclude": { - "out": true // set this to false to include "out" folder in search results - }, - "typescript.tsdk": "./node_modules/typescript/lib" // we want to use the TS server from our node_modules folder to control its version -} \ No newline at end of file diff --git a/vscode-extensions/vscode-application-yaml/.vscode/tasks.json b/vscode-extensions/vscode-application-yaml/.vscode/tasks.json deleted file mode 100644 index 1cbb9fd45..000000000 --- a/vscode-extensions/vscode-application-yaml/.vscode/tasks.json +++ /dev/null @@ -1,30 +0,0 @@ -// Available variables which can be used inside of strings. -// ${workspaceRoot}: the root folder of the team -// ${file}: the current opened file -// ${fileBasename}: the current opened file's basename -// ${fileDirname}: the current opened file's dirname -// ${fileExtname}: the current opened file's extension -// ${cwd}: the current working directory of the spawned process - -// A task runner that calls a custom npm script that compiles the extension. -{ - "version": "0.1.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": "silent", - - // we run the custom script "compile" as defined in package.json - "args": ["run", "compile"], //, "--loglevel", "silent"], - - // The tsc compiler is started in watching mode - "isWatching": true, - - // use the standard tsc in watch mode problem matcher to find compile problems in the output. - "problemMatcher": "$tsc-watch" -} \ No newline at end of file diff --git a/vscode-extensions/vscode-application-yaml/.vscodeignore b/vscode-extensions/vscode-application-yaml/.vscodeignore deleted file mode 100644 index 9023bd577..000000000 --- a/vscode-extensions/vscode-application-yaml/.vscodeignore +++ /dev/null @@ -1,30 +0,0 @@ -# IDE configs -.vscode/** -.idea/** -*.iml -javaconfig.json -classpath.txt -tsconfig.json -tsd.json -*.xml - -# Logs -*.log* - -# Sources -typings/** -src/** -test/** -lib/** -!lib/javaconfig.schema.json -repo/** -scripts/** - -# Compiler output -out/test/** -target/** -!target/vscode-application-yaml-*.jar - -# Extensions -.gitignore -**/*.map diff --git a/vscode-extensions/vscode-application-yaml/README.md b/vscode-extensions/vscode-application-yaml/README.md deleted file mode 100644 index 56f7ea830..000000000 --- a/vscode-extensions/vscode-application-yaml/README.md +++ /dev/null @@ -1,54 +0,0 @@ -# VS Code Language Server for Spring Boot Application Yaml - -VSCode extension and Language Server providing support for editing `application.yml` -files containing Spring Boot configuration properties. - -# Developer notes - -## Bulding and Running - -This project consists of three pieces: - - - a vscode-extension which is a language-server client implemented in TypeScript. - - commons-vscode: a local npm module with some utilities implemented in TypeScript. - - a language server implemented in Java. - -To build all these pieces you normally only need to run: - - npm install - -**However, the first time you build** it might fail trying to -find the `commons-vscode` module on npm central. Once we publish a stable -version of that module on npm central that will no longer be a problem. -Until that time, you can work around this by doing a one time manual -run of the `preinstall` script prior to running `npm install`: - - ./scripts/preinstall.sh - npm install - -Now you can open the client-app in vscode. From the root of this project. - - code . - -To launch the language server in a vscode runtime, press F5. - -## Debugging - -To debug the language server, open `lib/Main.ts` and edit to set the -`DEBUG` option to `true`. When you laucnh the app next by pressing -`F5` it will launch with debug options being passed to the JVM. - -You can then connect a 'Remote Java' Eclipse debugger on port 8000. - -## Packaging as a vscode extension - -First make sure the stuff is all built locally: - - ./scripts/preinstall.sh # only needed if this is the first build. - npm install - -Then package it: - - npm run vsce-package - -This produces a `.vsix` file which you can install directly into vscode. \ No newline at end of file diff --git a/vscode-extensions/vscode-application-yaml/lib/.gitignore b/vscode-extensions/vscode-application-yaml/lib/.gitignore deleted file mode 100644 index a6c7c2852..000000000 --- a/vscode-extensions/vscode-application-yaml/lib/.gitignore +++ /dev/null @@ -1 +0,0 @@ -*.js diff --git a/vscode-extensions/vscode-application-yaml/lib/Main.ts b/vscode-extensions/vscode-application-yaml/lib/Main.ts deleted file mode 100644 index 8faffd473..000000000 --- a/vscode-extensions/vscode-application-yaml/lib/Main.ts +++ /dev/null @@ -1,49 +0,0 @@ -'use strict'; -// The module 'vscode' contains the VS Code extensibility API -// Import the module and reference it with the alias vscode in your code below - -import * as VSCode from 'vscode'; -import * as Path from 'path'; -import * as FS from 'fs'; -import * as Net from 'net'; -import * as ChildProcess from 'child_process'; -import {LanguageClient, LanguageClientOptions, SettingMonitor, ServerOptions, StreamInfo} from 'vscode-languageclient'; -import {TextDocument} from 'vscode'; - -import * as commons from 'commons-vscode'; - -/** Called when extension is activated */ -export function activate(context: VSCode.ExtensionContext) { - let options : commons.ActivatorOptions = { - DEBUG: false, - extensionId: 'vscode-application-yml', - fatJarFile: 'target/vscode-application-yaml-0.0.1-SNAPSHOT.jar', - clientOptions: { - // HACK!!! documentSelector only takes string|string[] where string is language id, but DocumentFilter object is passed instead - // Reasons: - // 1. documentSelector is just passed over to functions like #registerHoverProvider(documentSelector, ...) that take documentSelector - // parameter in string | DocumentFilter | string[] | DocumentFilter[] format - // 2. Combination of non string|string[] documentSelector parameter and synchronize.textDocumentFilter function makes doc synchronization - // events pass on to Language Server only for documents for which function passed via textDocumentFilter property return true - - // TODO: Remove cast ones https://github.com/Microsoft/vscode-languageserver-node/issues/9 is resolved - documentSelector: [ {language: 'yaml', pattern: '**/application*.yml'}], - synchronize: { - // Synchronize the setting section to the server: - configurationSection: 'languageServerExample', - // Notify the server about file changes to 'javaconfig.json' files contain in the workspace - fileEvents: [ - //What's this for? Don't think it does anything useful for this example: - VSCode.workspace.createFileSystemWatcher('**/.clientrc') - ], - - // TODO: Remove textDocumentFilter property ones https://github.com/Microsoft/vscode-languageserver-node/issues/9 is resolved - textDocumentFilter: function(textDocument : TextDocument) : boolean { - let result : boolean = /^(.*\/)?application[^\s\\/]*.yml$/i.test(textDocument.fileName); - return result; - } - } - } - }; - commons.activate(options, context); -} diff --git a/vscode-extensions/vscode-application-yaml/package.json b/vscode-extensions/vscode-application-yaml/package.json deleted file mode 100644 index eeaae0312..000000000 --- a/vscode-extensions/vscode-application-yaml/package.json +++ /dev/null @@ -1,60 +0,0 @@ -{ - "name": "vscode-application-yml", - "displayName": "Spring Boot Application YML Support", - "description": "Provides validation and content assist for spring-boot application.yml file", - "icon": "spring_yml.png", - "version": "0.0.1", - "publisher": "kdvolder", - "repository": { - "type": "git", - "url": "https://github.com/spring-projects/sts4.git" - }, - "license": "EPL-1.0", - "engines": { - "npm": "^3.0.0", - "vscode": "^1.5.0" - }, - "categories": [ - "Languages", - "Linters" - ], - "keywords": [ - "yaml", "springboot" - ], - "activationEvents": [ - "onLanguage:yaml" - ], - "main": "./out/lib/Main", - "contributes": { - "configuration": { - "type": "object", - "title": "Example configuration", - "properties": { - "languageServerExample.maxNumberOfProblems": { - "type": "number", - "default": 100, - "description": "Controls the maximum number of problems produced by the server." - } - } - } - }, - "preview": true, - "scripts": { - "prepublish": "tsc -p .", - "clean": "rm -fr node_modules out *.vsix", - "compile": "tsc -watch -p ./", - "preinstall": "./scripts/preinstall.sh", - "postinstall": "node ./node_modules/vscode/bin/install", - "vsce-package": "vsce package" - }, - "dependencies": { - "vscode-languageclient": "2.5.x", - "commons-vscode": "^0.0.1" - }, - "devDependencies": { - "vsce": "^1.17.0", - "typescript": "^2.0.x", - "@types/node": "^6.0.40", - "vscode": "^1.0.0" - } -} diff --git a/vscode-extensions/vscode-application-yaml/pom.xml b/vscode-extensions/vscode-application-yaml/pom.xml deleted file mode 100644 index 1581b2ffc..000000000 --- a/vscode-extensions/vscode-application-yaml/pom.xml +++ /dev/null @@ -1,119 +0,0 @@ - - - 4.0.0 - vscode-application-yaml - jar - - - org.springframework.ide.vscode - commons-parent - 0.0.1-SNAPSHOT - ../commons/pom.xml - - - - - - jars-repository - Local repository for JAR files - file://${basedir}/repo - - - - - oss-sonatype - oss-sonatype - https://oss.sonatype.org/content/repositories/snapshots/ - - true - - - - - - - distribution-repository - Temporary Staging Repository - file://${basedir}/dist - - - - - - - org.springframework.ide.vscode - commons-language-server - ${project.version} - - - - org.springframework.ide.vscode - commons-java - ${project.version} - - - - org.springframework.ide.vscode - application-properties-metadata - ${project.version} - - - - org.springframework.ide.vscode - commons-yaml - ${project.version} - - - org.yaml - snakeyaml - 1.17 - - - - com.google.guava - guava - 18.0 - - - - org.springframework.ide.vscode - language-server-test-harness - ${project.version} - test - - - org.springframework.ide.vscode - properties-editor-test-harness - ${project.version} - test - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.3 - - 1.8 - 1.8 - - - - - - diff --git a/vscode-extensions/vscode-application-yaml/scripts/preinstall.sh b/vscode-extensions/vscode-application-yaml/scripts/preinstall.sh deleted file mode 100755 index f560474b8..000000000 --- a/vscode-extensions/vscode-application-yaml/scripts/preinstall.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash -set -e -(cd ../commons-vscode ; npm install) -npm install ../commons-vscode -../mvnw -f ../pom.xml -pl vscode-application-yaml -am clean install diff --git a/vscode-extensions/vscode-application-yaml/spring_yml.png b/vscode-extensions/vscode-application-yaml/spring_yml.png deleted file mode 100644 index a6a6a57a8..000000000 Binary files a/vscode-extensions/vscode-application-yaml/spring_yml.png and /dev/null differ diff --git a/vscode-extensions/vscode-application-yaml/src/main/java/org/springframework/ide/vscode/application/yaml/Main.java b/vscode-extensions/vscode-application-yaml/src/main/java/org/springframework/ide/vscode/application/yaml/Main.java deleted file mode 100644 index c60dcb225..000000000 --- a/vscode-extensions/vscode-application-yaml/src/main/java/org/springframework/ide/vscode/application/yaml/Main.java +++ /dev/null @@ -1,28 +0,0 @@ -package org.springframework.ide.vscode.application.yaml; - -import java.io.IOException; - -import org.springframework.ide.vscode.application.properties.metadata.DefaultSpringPropertyIndexProvider; -import org.springframework.ide.vscode.application.properties.metadata.SpringPropertyIndexProvider; -import org.springframework.ide.vscode.application.properties.metadata.types.TypeUtil; -import org.springframework.ide.vscode.application.properties.metadata.types.TypeUtilProvider; -import org.springframework.ide.vscode.commons.languageserver.LaunguageServerApp; -import org.springframework.ide.vscode.commons.languageserver.java.JavaProjectFinder; -import org.springframework.ide.vscode.commons.languageserver.util.IDocument; - -public class Main { - - public static void main(String[] args) throws IOException { - LaunguageServerApp.start(() -> { - JavaProjectFinder javaProjectFinder = JavaProjectFinder.DEFAULT; - //TODO: proper TypeUtilProvider and IndexProvider that somehow determine classpath that should be - // in effect for given IDocument and provide TypeUtil or SpringPropertyIndex parsed from that classpath. - // Note that the provider is responsible for doing some kind of sensible caching so that indexes are not - // rebuilt every time the index is being used. - SpringPropertyIndexProvider indexProvider = new DefaultSpringPropertyIndexProvider(javaProjectFinder); - TypeUtilProvider typeUtilProvider = (IDocument doc) -> new TypeUtil(javaProjectFinder.find(doc)); - ApplicationYamlLanguageServer server = new ApplicationYamlLanguageServer(indexProvider, typeUtilProvider, javaProjectFinder); - return server; - }); - } -} diff --git a/vscode-extensions/vscode-application-yaml/src/test/resources/workspace/testfile.yml b/vscode-extensions/vscode-application-yaml/src/test/resources/workspace/testfile.yml deleted file mode 100644 index d76572420..000000000 --- a/vscode-extensions/vscode-application-yaml/src/test/resources/workspace/testfile.yml +++ /dev/null @@ -1,3 +0,0 @@ -#There's a syntax error in this file -abc: foo -- foo diff --git a/vscode-extensions/vscode-application-yaml/test/examples/application.yml b/vscode-extensions/vscode-application-yaml/test/examples/application.yml deleted file mode 100644 index 565aac561..000000000 --- a/vscode-extensions/vscode-application-yaml/test/examples/application.yml +++ /dev/null @@ -1,3 +0,0 @@ -foo: bar -- asss -foo bar \ No newline at end of file diff --git a/vscode-extensions/vscode-application-yaml/tsconfig.json b/vscode-extensions/vscode-application-yaml/tsconfig.json deleted file mode 100644 index e98ba85c5..000000000 --- a/vscode-extensions/vscode-application-yaml/tsconfig.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "compilerOptions": { - "module": "commonjs", - "moduleResolution": "node", - "target": "es6", - "lib": [ - "es6" - ], - "declaration": true, - "outDir": "out", - "sourceMap": true, - "rootDir": "." - }, - "exclude": [ - "node_modules" - ] -} \ No newline at end of file diff --git a/vscode-extensions/vscode-application-yaml/tsd.json b/vscode-extensions/vscode-application-yaml/tsd.json deleted file mode 100644 index 50cd71dcf..000000000 --- a/vscode-extensions/vscode-application-yaml/tsd.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "version": "v4", - "repo": "borisyankov/DefinitelyTyped", - "ref": "master", - "path": "typings", - "bundle": "typings/tsd.d.ts", - "installed": { - "node/node.d.ts": { - "commit": "d22516f9f089de107d7e7d5938566377370631f6" - } - } -} diff --git a/vscode-extensions/vscode-boot-properties/pom.xml b/vscode-extensions/vscode-boot-properties/pom.xml index 5b7cfde97..bed2ac149 100644 --- a/vscode-extensions/vscode-boot-properties/pom.xml +++ b/vscode-extensions/vscode-boot-properties/pom.xml @@ -33,6 +33,11 @@ + + org.springframework.ide.vscode + application-properties-metadata + ${project.version} + org.springframework.ide.vscode java-properties @@ -43,13 +48,12 @@ commons-java ${project.version} - org.springframework.ide.vscode - vscode-application-yaml + commons-language-server ${project.version} - + org.springframework.ide.vscode diff --git a/vscode-extensions/vscode-boot-properties/src/main/java/org/springframework/ide/vscode/boot/BootPropertiesLanguageServer.java b/vscode-extensions/vscode-boot-properties/src/main/java/org/springframework/ide/vscode/boot/BootPropertiesLanguageServer.java index 3c4cf2e2a..8bb363197 100644 --- a/vscode-extensions/vscode-boot-properties/src/main/java/org/springframework/ide/vscode/boot/BootPropertiesLanguageServer.java +++ b/vscode-extensions/vscode-boot-properties/src/main/java/org/springframework/ide/vscode/boot/BootPropertiesLanguageServer.java @@ -19,11 +19,11 @@ import org.springframework.ide.vscode.application.properties.metadata.completion import org.springframework.ide.vscode.application.properties.metadata.completions.RelaxedNameConfig; import org.springframework.ide.vscode.application.properties.metadata.types.TypeUtilProvider; import org.springframework.ide.vscode.application.properties.metadata.util.FuzzyMap; -import org.springframework.ide.vscode.application.yaml.completions.ApplicationYamlAssistContext; -import org.springframework.ide.vscode.application.yaml.reconcile.ApplicationYamlReconcileEngine; import org.springframework.ide.vscode.boot.properties.completions.SpringPropertiesCompletionEngine; import org.springframework.ide.vscode.boot.properties.hover.PropertiesHoverInfoProvider; import org.springframework.ide.vscode.boot.properties.reconcile.SpringPropertiesReconcileEngine; +import org.springframework.ide.vscode.boot.yaml.completions.ApplicationYamlAssistContext; +import org.springframework.ide.vscode.boot.yaml.reconcile.ApplicationYamlReconcileEngine; import org.springframework.ide.vscode.commons.languageserver.completion.ICompletionEngine; import org.springframework.ide.vscode.commons.languageserver.completion.VscodeCompletionEngineAdapter; import org.springframework.ide.vscode.commons.languageserver.hover.HoverInfoProvider; diff --git a/vscode-extensions/vscode-boot-properties/src/main/java/org/springframework/ide/vscode/boot/properties/ApplicationPropertiesLanguageServer.java b/vscode-extensions/vscode-boot-properties/src/main/java/org/springframework/ide/vscode/boot/properties/ApplicationPropertiesLanguageServer.java index 41cfdc082..53547eaf1 100644 --- a/vscode-extensions/vscode-boot-properties/src/main/java/org/springframework/ide/vscode/boot/properties/ApplicationPropertiesLanguageServer.java +++ b/vscode-extensions/vscode-boot-properties/src/main/java/org/springframework/ide/vscode/boot/properties/ApplicationPropertiesLanguageServer.java @@ -15,6 +15,7 @@ import org.eclipse.lsp4j.ServerCapabilities; import org.eclipse.lsp4j.TextDocumentSyncKind; import org.springframework.ide.vscode.application.properties.metadata.SpringPropertyIndexProvider; import org.springframework.ide.vscode.application.properties.metadata.types.TypeUtilProvider; +import org.springframework.ide.vscode.boot.BootPropertiesLanguageServer; import org.springframework.ide.vscode.boot.properties.completions.SpringPropertiesCompletionEngine; import org.springframework.ide.vscode.boot.properties.hover.PropertiesHoverInfoProvider; import org.springframework.ide.vscode.boot.properties.reconcile.SpringPropertiesReconcileEngine; @@ -27,11 +28,11 @@ import org.springframework.ide.vscode.commons.languageserver.util.SimpleTextDocu import org.springframework.ide.vscode.commons.languageserver.util.TextDocument; /** - * Language Server for Spring Boot Application Properties files - * - * @author Alex Boyko - * + * Deprecated: This should not be used. In fact it isn't used anymore, except for in the tests. + * But these tests should be changed to test the 'merged' {@link BootPropertiesLanguageServer} + * instead. */ +@Deprecated public class ApplicationPropertiesLanguageServer extends SimpleLanguageServer { private SpringPropertyIndexProvider indexProvider; diff --git a/vscode-extensions/vscode-application-yaml/src/main/java/org/springframework/ide/vscode/application/yaml/ApplicationYamlLanguageServer.java b/vscode-extensions/vscode-boot-properties/src/main/java/org/springframework/ide/vscode/boot/yaml/ApplicationYamlLanguageServer.java similarity index 89% rename from vscode-extensions/vscode-application-yaml/src/main/java/org/springframework/ide/vscode/application/yaml/ApplicationYamlLanguageServer.java rename to vscode-extensions/vscode-boot-properties/src/main/java/org/springframework/ide/vscode/boot/yaml/ApplicationYamlLanguageServer.java index 30484a4ec..4add55852 100644 --- a/vscode-extensions/vscode-application-yaml/src/main/java/org/springframework/ide/vscode/application/yaml/ApplicationYamlLanguageServer.java +++ b/vscode-extensions/vscode-boot-properties/src/main/java/org/springframework/ide/vscode/boot/yaml/ApplicationYamlLanguageServer.java @@ -1,4 +1,4 @@ -package org.springframework.ide.vscode.application.yaml; +package org.springframework.ide.vscode.boot.yaml; import org.eclipse.lsp4j.CompletionOptions; import org.eclipse.lsp4j.ServerCapabilities; @@ -9,9 +9,10 @@ import org.springframework.ide.vscode.application.properties.metadata.completion import org.springframework.ide.vscode.application.properties.metadata.completions.RelaxedNameConfig; import org.springframework.ide.vscode.application.properties.metadata.types.TypeUtilProvider; import org.springframework.ide.vscode.application.properties.metadata.util.FuzzyMap; -import org.springframework.ide.vscode.application.yaml.completions.ApplicationYamlAssistContext; -import org.springframework.ide.vscode.application.yaml.completions.ApplicationYamlStructureProvider; -import org.springframework.ide.vscode.application.yaml.reconcile.ApplicationYamlReconcileEngine; +import org.springframework.ide.vscode.boot.BootPropertiesLanguageServer; +import org.springframework.ide.vscode.boot.yaml.completions.ApplicationYamlAssistContext; +import org.springframework.ide.vscode.boot.yaml.completions.ApplicationYamlStructureProvider; +import org.springframework.ide.vscode.boot.yaml.reconcile.ApplicationYamlReconcileEngine; import org.springframework.ide.vscode.commons.languageserver.completion.VscodeCompletionEngineAdapter; import org.springframework.ide.vscode.commons.languageserver.hover.HoverInfoProvider; import org.springframework.ide.vscode.commons.languageserver.hover.VscodeHoverEngineAdapter; @@ -31,6 +32,12 @@ import org.springframework.ide.vscode.commons.yaml.structure.YamlDocument; import org.springframework.ide.vscode.commons.yaml.structure.YamlStructureProvider; import org.yaml.snakeyaml.Yaml; +/** + * Deprecated: This should not be used. In fact it isn't used anymore, except for in the tests. + * But these tests should be changed to test the 'merged' {@link BootPropertiesLanguageServer} + * instead. + */ +@Deprecated public class ApplicationYamlLanguageServer extends SimpleLanguageServer { private Yaml yaml = new Yaml(); diff --git a/vscode-extensions/vscode-application-yaml/src/main/java/org/springframework/ide/vscode/application/yaml/completions/ApplicationYamlAssistContext.java b/vscode-extensions/vscode-boot-properties/src/main/java/org/springframework/ide/vscode/boot/yaml/completions/ApplicationYamlAssistContext.java similarity index 99% rename from vscode-extensions/vscode-application-yaml/src/main/java/org/springframework/ide/vscode/application/yaml/completions/ApplicationYamlAssistContext.java rename to vscode-extensions/vscode-boot-properties/src/main/java/org/springframework/ide/vscode/boot/yaml/completions/ApplicationYamlAssistContext.java index 4418665ff..4a5e7016e 100644 --- a/vscode-extensions/vscode-application-yaml/src/main/java/org/springframework/ide/vscode/application/yaml/completions/ApplicationYamlAssistContext.java +++ b/vscode-extensions/vscode-boot-properties/src/main/java/org/springframework/ide/vscode/boot/yaml/completions/ApplicationYamlAssistContext.java @@ -8,7 +8,7 @@ * Contributors: * Pivotal, Inc. - initial API and implementation *******************************************************************************/ -package org.springframework.ide.vscode.application.yaml.completions; +package org.springframework.ide.vscode.boot.yaml.completions; import java.util.ArrayList; import java.util.Collection; diff --git a/vscode-extensions/vscode-application-yaml/src/main/java/org/springframework/ide/vscode/application/yaml/completions/ApplicationYamlStructureProvider.java b/vscode-extensions/vscode-boot-properties/src/main/java/org/springframework/ide/vscode/boot/yaml/completions/ApplicationYamlStructureProvider.java similarity index 94% rename from vscode-extensions/vscode-application-yaml/src/main/java/org/springframework/ide/vscode/application/yaml/completions/ApplicationYamlStructureProvider.java rename to vscode-extensions/vscode-boot-properties/src/main/java/org/springframework/ide/vscode/boot/yaml/completions/ApplicationYamlStructureProvider.java index 7505635a3..3ebcd573e 100644 --- a/vscode-extensions/vscode-application-yaml/src/main/java/org/springframework/ide/vscode/application/yaml/completions/ApplicationYamlStructureProvider.java +++ b/vscode-extensions/vscode-boot-properties/src/main/java/org/springframework/ide/vscode/boot/yaml/completions/ApplicationYamlStructureProvider.java @@ -8,7 +8,7 @@ * Contributors: * Pivotal, Inc. - initial API and implementation *******************************************************************************/ -package org.springframework.ide.vscode.application.yaml.completions; +package org.springframework.ide.vscode.boot.yaml.completions; import java.util.Collections; diff --git a/vscode-extensions/vscode-application-yaml/src/main/java/org/springframework/ide/vscode/application/yaml/completions/JavaTypeNavigationHoverInfo.java b/vscode-extensions/vscode-boot-properties/src/main/java/org/springframework/ide/vscode/boot/yaml/completions/JavaTypeNavigationHoverInfo.java similarity index 99% rename from vscode-extensions/vscode-application-yaml/src/main/java/org/springframework/ide/vscode/application/yaml/completions/JavaTypeNavigationHoverInfo.java rename to vscode-extensions/vscode-boot-properties/src/main/java/org/springframework/ide/vscode/boot/yaml/completions/JavaTypeNavigationHoverInfo.java index 732c3c993..4dc571373 100644 --- a/vscode-extensions/vscode-application-yaml/src/main/java/org/springframework/ide/vscode/application/yaml/completions/JavaTypeNavigationHoverInfo.java +++ b/vscode-extensions/vscode-boot-properties/src/main/java/org/springframework/ide/vscode/boot/yaml/completions/JavaTypeNavigationHoverInfo.java @@ -8,7 +8,7 @@ * Contributors: * Pivotal, Inc. - initial API and implementation *******************************************************************************/ -package org.springframework.ide.vscode.application.yaml.completions; +package org.springframework.ide.vscode.boot.yaml.completions; import java.util.ArrayList; import java.util.Collections; diff --git a/vscode-extensions/vscode-application-yaml/src/main/java/org/springframework/ide/vscode/application/yaml/quickfix/ReplaceDeprecatedYamlQuickfix.java b/vscode-extensions/vscode-boot-properties/src/main/java/org/springframework/ide/vscode/boot/yaml/quickfix/ReplaceDeprecatedYamlQuickfix.java similarity index 98% rename from vscode-extensions/vscode-application-yaml/src/main/java/org/springframework/ide/vscode/application/yaml/quickfix/ReplaceDeprecatedYamlQuickfix.java rename to vscode-extensions/vscode-boot-properties/src/main/java/org/springframework/ide/vscode/boot/yaml/quickfix/ReplaceDeprecatedYamlQuickfix.java index 5d1731578..3cb4b91e0 100644 --- a/vscode-extensions/vscode-application-yaml/src/main/java/org/springframework/ide/vscode/application/yaml/quickfix/ReplaceDeprecatedYamlQuickfix.java +++ b/vscode-extensions/vscode-boot-properties/src/main/java/org/springframework/ide/vscode/boot/yaml/quickfix/ReplaceDeprecatedYamlQuickfix.java @@ -8,7 +8,7 @@ * Contributors: * Pivotal, Inc. - initial API and implementation *******************************************************************************/ -package org.springframework.ide.vscode.application.yaml.quickfix; +package org.springframework.ide.vscode.boot.yaml.quickfix; import org.eclipse.lsp4j.CompletionItemKind; import org.springframework.ide.vscode.commons.languageserver.completion.DocumentEdits; diff --git a/vscode-extensions/vscode-application-yaml/src/main/java/org/springframework/ide/vscode/application/yaml/reconcile/ApplicationYamlASTReconciler.java b/vscode-extensions/vscode-boot-properties/src/main/java/org/springframework/ide/vscode/boot/yaml/reconcile/ApplicationYamlASTReconciler.java similarity index 97% rename from vscode-extensions/vscode-application-yaml/src/main/java/org/springframework/ide/vscode/application/yaml/reconcile/ApplicationYamlASTReconciler.java rename to vscode-extensions/vscode-boot-properties/src/main/java/org/springframework/ide/vscode/boot/yaml/reconcile/ApplicationYamlASTReconciler.java index 538d37783..c3edc51a9 100644 --- a/vscode-extensions/vscode-application-yaml/src/main/java/org/springframework/ide/vscode/application/yaml/reconcile/ApplicationYamlASTReconciler.java +++ b/vscode-extensions/vscode-boot-properties/src/main/java/org/springframework/ide/vscode/boot/yaml/reconcile/ApplicationYamlASTReconciler.java @@ -1,7 +1,7 @@ -package org.springframework.ide.vscode.application.yaml.reconcile; +package org.springframework.ide.vscode.boot.yaml.reconcile; -import static org.springframework.ide.vscode.application.yaml.reconcile.ApplicationYamlProblemType.YAML_DEPRECATED; -import static org.springframework.ide.vscode.application.yaml.reconcile.ApplicationYamlProblemType.YAML_DUPLICATE_KEY; +import static org.springframework.ide.vscode.boot.yaml.reconcile.ApplicationYamlProblemType.YAML_DEPRECATED; +import static org.springframework.ide.vscode.boot.yaml.reconcile.ApplicationYamlProblemType.YAML_DUPLICATE_KEY; import static org.springframework.ide.vscode.commons.yaml.ast.NodeUtil.asScalar; import static org.springframework.ide.vscode.commons.yaml.ast.YamlFileAST.getChildren; @@ -17,7 +17,7 @@ import org.springframework.ide.vscode.application.properties.metadata.types.Type import org.springframework.ide.vscode.application.properties.metadata.types.TypeUtil; import org.springframework.ide.vscode.application.properties.metadata.types.TypeUtil.BeanPropertyNameMode; import org.springframework.ide.vscode.application.properties.metadata.types.TypeUtil.EnumCaseMode; -import org.springframework.ide.vscode.application.yaml.quickfix.ReplaceDeprecatedYamlQuickfix; +import org.springframework.ide.vscode.boot.yaml.quickfix.ReplaceDeprecatedYamlQuickfix; import org.springframework.ide.vscode.application.properties.metadata.types.TypedProperty; import org.springframework.ide.vscode.commons.languageserver.reconcile.IProblemCollector; import org.springframework.ide.vscode.commons.util.StringUtil; diff --git a/vscode-extensions/vscode-application-yaml/src/main/java/org/springframework/ide/vscode/application/yaml/reconcile/ApplicationYamlProblemType.java b/vscode-extensions/vscode-boot-properties/src/main/java/org/springframework/ide/vscode/boot/yaml/reconcile/ApplicationYamlProblemType.java similarity index 97% rename from vscode-extensions/vscode-application-yaml/src/main/java/org/springframework/ide/vscode/application/yaml/reconcile/ApplicationYamlProblemType.java rename to vscode-extensions/vscode-boot-properties/src/main/java/org/springframework/ide/vscode/boot/yaml/reconcile/ApplicationYamlProblemType.java index 9ad4276b3..d025c536d 100644 --- a/vscode-extensions/vscode-application-yaml/src/main/java/org/springframework/ide/vscode/application/yaml/reconcile/ApplicationYamlProblemType.java +++ b/vscode-extensions/vscode-boot-properties/src/main/java/org/springframework/ide/vscode/boot/yaml/reconcile/ApplicationYamlProblemType.java @@ -8,7 +8,7 @@ * Contributors: * Pivotal, Inc. - initial API and implementation *******************************************************************************/ -package org.springframework.ide.vscode.application.yaml.reconcile; +package org.springframework.ide.vscode.boot.yaml.reconcile; import static org.springframework.ide.vscode.commons.languageserver.reconcile.ProblemSeverity.ERROR; import static org.springframework.ide.vscode.commons.languageserver.reconcile.ProblemSeverity.WARNING; diff --git a/vscode-extensions/vscode-application-yaml/src/main/java/org/springframework/ide/vscode/application/yaml/reconcile/ApplicationYamlProblems.java b/vscode-extensions/vscode-boot-properties/src/main/java/org/springframework/ide/vscode/boot/yaml/reconcile/ApplicationYamlProblems.java similarity index 94% rename from vscode-extensions/vscode-application-yaml/src/main/java/org/springframework/ide/vscode/application/yaml/reconcile/ApplicationYamlProblems.java rename to vscode-extensions/vscode-boot-properties/src/main/java/org/springframework/ide/vscode/boot/yaml/reconcile/ApplicationYamlProblems.java index 5df78ecef..145a76035 100644 --- a/vscode-extensions/vscode-application-yaml/src/main/java/org/springframework/ide/vscode/application/yaml/reconcile/ApplicationYamlProblems.java +++ b/vscode-extensions/vscode-boot-properties/src/main/java/org/springframework/ide/vscode/boot/yaml/reconcile/ApplicationYamlProblems.java @@ -1,4 +1,4 @@ -package org.springframework.ide.vscode.application.yaml.reconcile; +package org.springframework.ide.vscode.boot.yaml.reconcile; import static org.springframework.ide.vscode.commons.languageserver.reconcile.ProblemSeverity.ERROR; diff --git a/vscode-extensions/vscode-application-yaml/src/main/java/org/springframework/ide/vscode/application/yaml/reconcile/ApplicationYamlReconcileEngine.java b/vscode-extensions/vscode-boot-properties/src/main/java/org/springframework/ide/vscode/boot/yaml/reconcile/ApplicationYamlReconcileEngine.java similarity index 92% rename from vscode-extensions/vscode-application-yaml/src/main/java/org/springframework/ide/vscode/application/yaml/reconcile/ApplicationYamlReconcileEngine.java rename to vscode-extensions/vscode-boot-properties/src/main/java/org/springframework/ide/vscode/boot/yaml/reconcile/ApplicationYamlReconcileEngine.java index fc7258adf..03d3d52ca 100644 --- a/vscode-extensions/vscode-application-yaml/src/main/java/org/springframework/ide/vscode/application/yaml/reconcile/ApplicationYamlReconcileEngine.java +++ b/vscode-extensions/vscode-boot-properties/src/main/java/org/springframework/ide/vscode/boot/yaml/reconcile/ApplicationYamlReconcileEngine.java @@ -8,9 +8,9 @@ * Contributors: * Pivotal, Inc. - initial API and implementation *******************************************************************************/ -package org.springframework.ide.vscode.application.yaml.reconcile; +package org.springframework.ide.vscode.boot.yaml.reconcile; -import static org.springframework.ide.vscode.application.yaml.reconcile.ApplicationYamlProblems.Type.YAML_SYNTAX_ERROR; +import static org.springframework.ide.vscode.boot.yaml.reconcile.ApplicationYamlProblems.Type.YAML_SYNTAX_ERROR; import org.springframework.ide.vscode.application.properties.metadata.IndexNavigator; import org.springframework.ide.vscode.application.properties.metadata.PropertyInfo; diff --git a/vscode-extensions/vscode-application-yaml/src/main/java/org/springframework/ide/vscode/application/yaml/reconcile/SpringPropertyProblem.java b/vscode-extensions/vscode-boot-properties/src/main/java/org/springframework/ide/vscode/boot/yaml/reconcile/SpringPropertyProblem.java similarity index 93% rename from vscode-extensions/vscode-application-yaml/src/main/java/org/springframework/ide/vscode/application/yaml/reconcile/SpringPropertyProblem.java rename to vscode-extensions/vscode-boot-properties/src/main/java/org/springframework/ide/vscode/boot/yaml/reconcile/SpringPropertyProblem.java index 55fa13c52..53b3645df 100644 --- a/vscode-extensions/vscode-application-yaml/src/main/java/org/springframework/ide/vscode/application/yaml/reconcile/SpringPropertyProblem.java +++ b/vscode-extensions/vscode-boot-properties/src/main/java/org/springframework/ide/vscode/boot/yaml/reconcile/SpringPropertyProblem.java @@ -1,4 +1,4 @@ -package org.springframework.ide.vscode.application.yaml.reconcile; +package org.springframework.ide.vscode.boot.yaml.reconcile; import org.springframework.ide.vscode.application.properties.metadata.PropertyInfo; import org.springframework.ide.vscode.commons.languageserver.quickfix.ProblemFixer; diff --git a/vscode-extensions/vscode-boot-properties/src/test/java/org/springframework/ide/vscode/boot/properties/test/ApplicationPropertiesEditorTest.java b/vscode-extensions/vscode-boot-properties/src/test/java/org/springframework/ide/vscode/boot/test/ApplicationPropertiesEditorTest.java similarity index 99% rename from vscode-extensions/vscode-boot-properties/src/test/java/org/springframework/ide/vscode/boot/properties/test/ApplicationPropertiesEditorTest.java rename to vscode-extensions/vscode-boot-properties/src/test/java/org/springframework/ide/vscode/boot/test/ApplicationPropertiesEditorTest.java index 474ca9dd2..db30e5409 100644 --- a/vscode-extensions/vscode-boot-properties/src/test/java/org/springframework/ide/vscode/boot/properties/test/ApplicationPropertiesEditorTest.java +++ b/vscode-extensions/vscode-boot-properties/src/test/java/org/springframework/ide/vscode/boot/test/ApplicationPropertiesEditorTest.java @@ -8,7 +8,7 @@ * Contributors: * Pivotal, Inc. - initial API and implementation *******************************************************************************/ -package org.springframework.ide.vscode.boot.properties.test; +package org.springframework.ide.vscode.boot.test; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; diff --git a/vscode-extensions/vscode-boot-properties/src/test/java/org/springframework/ide/vscode/boot/properties/test/ApplicationPropertiesLanguageServerTest.java b/vscode-extensions/vscode-boot-properties/src/test/java/org/springframework/ide/vscode/boot/test/ApplicationPropertiesLanguageServerTest.java similarity index 97% rename from vscode-extensions/vscode-boot-properties/src/test/java/org/springframework/ide/vscode/boot/properties/test/ApplicationPropertiesLanguageServerTest.java rename to vscode-extensions/vscode-boot-properties/src/test/java/org/springframework/ide/vscode/boot/test/ApplicationPropertiesLanguageServerTest.java index bee75b32a..0278fbbd3 100644 --- a/vscode-extensions/vscode-boot-properties/src/test/java/org/springframework/ide/vscode/boot/properties/test/ApplicationPropertiesLanguageServerTest.java +++ b/vscode-extensions/vscode-boot-properties/src/test/java/org/springframework/ide/vscode/boot/test/ApplicationPropertiesLanguageServerTest.java @@ -8,7 +8,7 @@ * Contributors: * Pivotal, Inc. - initial API and implementation *******************************************************************************/ -package org.springframework.ide.vscode.boot.properties.test; +package org.springframework.ide.vscode.boot.test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/vscode-extensions/vscode-application-yaml/src/test/java/org/springframework/ide/vscode/application/yaml/ApplicationYamlEditorTest.java b/vscode-extensions/vscode-boot-properties/src/test/java/org/springframework/ide/vscode/boot/test/ApplicationYamlEditorTest.java similarity index 99% rename from vscode-extensions/vscode-application-yaml/src/test/java/org/springframework/ide/vscode/application/yaml/ApplicationYamlEditorTest.java rename to vscode-extensions/vscode-boot-properties/src/test/java/org/springframework/ide/vscode/boot/test/ApplicationYamlEditorTest.java index 208a1770b..0f31f0542 100644 --- a/vscode-extensions/vscode-application-yaml/src/test/java/org/springframework/ide/vscode/application/yaml/ApplicationYamlEditorTest.java +++ b/vscode-extensions/vscode-boot-properties/src/test/java/org/springframework/ide/vscode/boot/test/ApplicationYamlEditorTest.java @@ -8,7 +8,7 @@ * Contributors: * Pivotal, Inc. - initial API and implementation *******************************************************************************/ -package org.springframework.ide.vscode.application.yaml; +package org.springframework.ide.vscode.boot.test; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -20,6 +20,7 @@ import org.junit.Ignore; import org.junit.Test; import org.springframework.ide.vscode.application.properties.metadata.CachingValueProvider; import org.springframework.ide.vscode.application.properties.metadata.PropertyInfo; +import org.springframework.ide.vscode.boot.yaml.ApplicationYamlLanguageServer; import org.springframework.ide.vscode.commons.java.IJavaProject; import org.springframework.ide.vscode.commons.languageserver.java.JavaProjectFinder; import org.springframework.ide.vscode.commons.languageserver.util.SimpleLanguageServer; diff --git a/vscode-extensions/vscode-application-yaml/src/test/java/org/springframework/ide/vscode/application/yaml/ApplicationYamlLanguageServerTests.java b/vscode-extensions/vscode-boot-properties/src/test/java/org/springframework/ide/vscode/boot/test/ApplicationYamlLanguageServerTests.java similarity index 92% rename from vscode-extensions/vscode-application-yaml/src/test/java/org/springframework/ide/vscode/application/yaml/ApplicationYamlLanguageServerTests.java rename to vscode-extensions/vscode-boot-properties/src/test/java/org/springframework/ide/vscode/boot/test/ApplicationYamlLanguageServerTests.java index 0d520c96c..385110c87 100644 --- a/vscode-extensions/vscode-application-yaml/src/test/java/org/springframework/ide/vscode/application/yaml/ApplicationYamlLanguageServerTests.java +++ b/vscode-extensions/vscode-boot-properties/src/test/java/org/springframework/ide/vscode/boot/test/ApplicationYamlLanguageServerTests.java @@ -1,4 +1,4 @@ -package org.springframework.ide.vscode.application.yaml; +package org.springframework.ide.vscode.boot.test; import static org.assertj.core.api.Assertions.assertThat; @@ -11,6 +11,7 @@ import org.eclipse.lsp4j.InitializeResult; import org.eclipse.lsp4j.TextDocumentSyncKind; import org.eclipse.lsp4j.services.LanguageServer; import org.junit.Test; +import org.springframework.ide.vscode.boot.yaml.ApplicationYamlLanguageServer; import org.springframework.ide.vscode.languageserver.testharness.LanguageServerHarness; public class ApplicationYamlLanguageServerTests {