diff --git a/vscode-extensions/vscode-application-properties/.classpath b/vscode-extensions/vscode-application-properties/.classpath deleted file mode 100644 index d46faf10e..000000000 --- a/vscode-extensions/vscode-application-properties/.classpath +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/vscode-extensions/vscode-application-properties/.gitignore b/vscode-extensions/vscode-application-properties/.gitignore deleted file mode 100644 index 8c44546ea..000000000 --- a/vscode-extensions/vscode-application-properties/.gitignore +++ /dev/null @@ -1,12 +0,0 @@ -out -node_modules -target -*.log -*.log.* -classpath.txt -*.vsix -repo -.idea -*.iml -.DS_Store -**/.DS_Store \ No newline at end of file diff --git a/vscode-extensions/vscode-application-properties/.project b/vscode-extensions/vscode-application-properties/.project deleted file mode 100644 index 2a069378f..000000000 --- a/vscode-extensions/vscode-application-properties/.project +++ /dev/null @@ -1,23 +0,0 @@ - - - vscode-application-properties - - - - - - 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-properties/.settings/org.eclipse.jdt.core.prefs b/vscode-extensions/vscode-application-properties/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 714351aec..000000000 --- a/vscode-extensions/vscode-application-properties/.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-properties/.settings/org.eclipse.m2e.core.prefs b/vscode-extensions/vscode-application-properties/.settings/org.eclipse.m2e.core.prefs deleted file mode 100644 index f897a7f1c..000000000 --- a/vscode-extensions/vscode-application-properties/.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-properties/.vscode/launch.json b/vscode-extensions/vscode-application-properties/.vscode/launch.json deleted file mode 100644 index 52ebf9f9e..000000000 --- a/vscode-extensions/vscode-application-properties/.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-properties/.vscode/settings.json b/vscode-extensions/vscode-application-properties/.vscode/settings.json deleted file mode 100644 index c5592bee9..000000000 --- a/vscode-extensions/vscode-application-properties/.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-properties/.vscode/tasks.json b/vscode-extensions/vscode-application-properties/.vscode/tasks.json deleted file mode 100644 index 1cbb9fd45..000000000 --- a/vscode-extensions/vscode-application-properties/.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-properties/.vscodeignore b/vscode-extensions/vscode-application-properties/.vscodeignore deleted file mode 100644 index 8111020de..000000000 --- a/vscode-extensions/vscode-application-properties/.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-properties-*.jar - -# Extensions -.gitignore -**/*.map diff --git a/vscode-extensions/vscode-application-properties/README.md b/vscode-extensions/vscode-application-properties/README.md deleted file mode 100644 index 80e80de29..000000000 --- a/vscode-extensions/vscode-application-properties/README.md +++ /dev/null @@ -1,54 +0,0 @@ -# VS Code Language Server for Spring Boot Application Properties - -VSCode extension and Language Server providing support for editing `application.properties` -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-properties/lib/.gitignore b/vscode-extensions/vscode-application-properties/lib/.gitignore deleted file mode 100644 index a6c7c2852..000000000 --- a/vscode-extensions/vscode-application-properties/lib/.gitignore +++ /dev/null @@ -1 +0,0 @@ -*.js diff --git a/vscode-extensions/vscode-application-properties/lib/Main.ts b/vscode-extensions/vscode-application-properties/lib/Main.ts deleted file mode 100644 index 97ceee0fd..000000000 --- a/vscode-extensions/vscode-application-properties/lib/Main.ts +++ /dev/null @@ -1,44 +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-properties', - fatJarFile: 'target/vscode-application-properties-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: 'ini', pattern: '**/application*.properties'}, - {language: 'java-properties', pattern: '**/application*.properties'}, - {language: 'properties', pattern: '**/application*.properties'} - ], - synchronize: { - // TODO: Remove textDocumentFilter property ones https://github.com/Microsoft/vscode-languageserver-node/issues/9 is resolved - textDocumentFilter: function(textDocument : TextDocument) : boolean { - return /^(.*\/)?application[^\s\\/]*.properties$/i.test(textDocument.fileName); - } - } - } - }; - commons.activate(options, context); -} diff --git a/vscode-extensions/vscode-application-properties/package.json b/vscode-extensions/vscode-application-properties/package.json deleted file mode 100644 index 0c9100de0..000000000 --- a/vscode-extensions/vscode-application-properties/package.json +++ /dev/null @@ -1,62 +0,0 @@ -{ - "name": "vscode-application-properties", - "displayName": "Spring Boot Application Properties Support", - "description": "Provides validation and content assist for Spring Boot application.properties file", - "icon": "spring.gif", - "version": "0.0.1", - "publisher": "Pivotal", - "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": [ - "java-properties", "spring-boot", "application-properties" - ], - "activationEvents": [ - "onLanguage:ini", - "onLanguage:java-properties", - "onLanguage:properties" - ], - "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-properties/pom.xml b/vscode-extensions/vscode-application-properties/pom.xml deleted file mode 100644 index 384d98dd9..000000000 --- a/vscode-extensions/vscode-application-properties/pom.xml +++ /dev/null @@ -1,107 +0,0 @@ - - - 4.0.0 - vscode-application-properties - jar - - - org.springframework.ide.vscode - commons-parent - 0.0.1-SNAPSHOT - ../commons/pom.xml - - - - - - oss-sonatype - oss-sonatype - https://oss.sonatype.org/content/repositories/snapshots/ - - true - - - - - - - distribution-repository - Temporary Staging Repository - file://${basedir}/dist - - - - - - - com.google.guava - guava - 18.0 - - - - org.springframework.ide.vscode - java-properties - ${project.version} - - - - org.springframework.ide.vscode - commons-language-server - ${project.version} - - - - org.springframework.ide.vscode - application-properties-metadata - ${project.version} - - - - org.springframework.ide.vscode - project-test-harness - ${project.version} - test - - - 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-properties/scripts/preinstall.sh b/vscode-extensions/vscode-application-properties/scripts/preinstall.sh deleted file mode 100755 index 1bc932668..000000000 --- a/vscode-extensions/vscode-application-properties/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-properties -am clean install diff --git a/vscode-extensions/vscode-application-properties/spring.gif b/vscode-extensions/vscode-application-properties/spring.gif deleted file mode 100644 index 70b850977..000000000 Binary files a/vscode-extensions/vscode-application-properties/spring.gif and /dev/null differ diff --git a/vscode-extensions/vscode-application-properties/src/main/java/org/springframework/ide/vscode/application/properties/Main.java b/vscode-extensions/vscode-application-properties/src/main/java/org/springframework/ide/vscode/application/properties/Main.java deleted file mode 100644 index b30f7fc22..000000000 --- a/vscode-extensions/vscode-application-properties/src/main/java/org/springframework/ide/vscode/application/properties/Main.java +++ /dev/null @@ -1,43 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2016 Pivotal, Inc. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Pivotal, Inc. - initial API and implementation - *******************************************************************************/ -package org.springframework.ide.vscode.application.properties; - -import java.io.IOException; - -import org.eclipse.lsp4j.services.LanguageServer; -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; - -/** - * Starts up Language Server process - * - * @author Alex Boyko - * @author Kris De Volder - * - */ -public class Main { - - public static void main(String[] args) throws IOException { - LaunguageServerApp.start(() -> { - JavaProjectFinder javaProjectFinder = JavaProjectFinder.DEFAULT; - SpringPropertyIndexProvider indexProvider = new DefaultSpringPropertyIndexProvider(javaProjectFinder); - TypeUtilProvider typeUtilProvider = (IDocument doc) -> new TypeUtil(javaProjectFinder.find(doc)); - LanguageServer server = new ApplicationPropertiesLanguageServer(indexProvider, typeUtilProvider, javaProjectFinder); - return server; - }); - } - -} diff --git a/vscode-extensions/vscode-application-properties/src/test/resources/workspace/application.properties b/vscode-extensions/vscode-application-properties/src/test/resources/workspace/application.properties deleted file mode 100644 index 3a87ccd5f..000000000 --- a/vscode-extensions/vscode-application-properties/src/test/resources/workspace/application.properties +++ /dev/null @@ -1,3 +0,0 @@ -#Bar role -app=foo -bad diff --git a/vscode-extensions/vscode-application-properties/tsconfig.json b/vscode-extensions/vscode-application-properties/tsconfig.json deleted file mode 100644 index 1905ffea7..000000000 --- a/vscode-extensions/vscode-application-properties/tsconfig.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "compilerOptions": { - "module": "commonjs", - "moduleResolution": "node", - "target": "es6", - "lib": [ - "es6" - ], - "declaration": true, - "outDir": "out", - "sourceMap": true, - "rootDir": "." - }, - "include": [ - "typings/*.d.ts", - "lib/**/*.ts" - ], - "exclude": [ - "node_modules" - ] -} \ No newline at end of file diff --git a/vscode-extensions/vscode-boot-properties/pom.xml b/vscode-extensions/vscode-boot-properties/pom.xml index a77de5c99..5b7cfde97 100644 --- a/vscode-extensions/vscode-boot-properties/pom.xml +++ b/vscode-extensions/vscode-boot-properties/pom.xml @@ -35,14 +35,41 @@ org.springframework.ide.vscode - vscode-application-properties + java-properties ${project.version} + + org.springframework.ide.vscode + commons-java + ${project.version} + + org.springframework.ide.vscode vscode-application-yaml ${project.version} + + + + org.springframework.ide.vscode + project-test-harness + ${project.version} + test + + + org.springframework.ide.vscode + language-server-test-harness + ${project.version} + test + + + org.springframework.ide.vscode + properties-editor-test-harness + ${project.version} + test + + 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 a8728618d..3c4cf2e2a 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 @@ -10,24 +10,20 @@ *******************************************************************************/ package org.springframework.ide.vscode.boot; -import static org.springframework.ide.vscode.commons.util.Providers.lazy; - -import javax.inject.Provider; - import org.eclipse.lsp4j.CompletionOptions; import org.eclipse.lsp4j.ServerCapabilities; import org.eclipse.lsp4j.TextDocumentSyncKind; -import org.springframework.ide.vscode.application.properties.completions.SpringPropertiesCompletionEngine; -import org.springframework.ide.vscode.application.properties.hover.PropertiesHoverInfoProvider; import org.springframework.ide.vscode.application.properties.metadata.PropertyInfo; import org.springframework.ide.vscode.application.properties.metadata.SpringPropertyIndexProvider; import org.springframework.ide.vscode.application.properties.metadata.completions.PropertyCompletionFactory; 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.properties.reconcile.SpringPropertiesReconcileEngine; 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.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-application-properties/src/main/java/org/springframework/ide/vscode/application/properties/ApplicationPropertiesLanguageServer.java b/vscode-extensions/vscode-boot-properties/src/main/java/org/springframework/ide/vscode/boot/properties/ApplicationPropertiesLanguageServer.java similarity index 91% rename from vscode-extensions/vscode-application-properties/src/main/java/org/springframework/ide/vscode/application/properties/ApplicationPropertiesLanguageServer.java rename to vscode-extensions/vscode-boot-properties/src/main/java/org/springframework/ide/vscode/boot/properties/ApplicationPropertiesLanguageServer.java index e0e075f3b..41cfdc082 100644 --- a/vscode-extensions/vscode-application-properties/src/main/java/org/springframework/ide/vscode/application/properties/ApplicationPropertiesLanguageServer.java +++ b/vscode-extensions/vscode-boot-properties/src/main/java/org/springframework/ide/vscode/boot/properties/ApplicationPropertiesLanguageServer.java @@ -8,16 +8,16 @@ * Contributors: * Pivotal, Inc. - initial API and implementation *******************************************************************************/ -package org.springframework.ide.vscode.application.properties; +package org.springframework.ide.vscode.boot.properties; import org.eclipse.lsp4j.CompletionOptions; import org.eclipse.lsp4j.ServerCapabilities; import org.eclipse.lsp4j.TextDocumentSyncKind; -import org.springframework.ide.vscode.application.properties.completions.SpringPropertiesCompletionEngine; -import org.springframework.ide.vscode.application.properties.hover.PropertiesHoverInfoProvider; import org.springframework.ide.vscode.application.properties.metadata.SpringPropertyIndexProvider; import org.springframework.ide.vscode.application.properties.metadata.types.TypeUtilProvider; -import org.springframework.ide.vscode.application.properties.reconcile.SpringPropertiesReconcileEngine; +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.commons.languageserver.completion.VscodeCompletionEngineAdapter; import org.springframework.ide.vscode.commons.languageserver.hover.VscodeHoverEngineAdapter; import org.springframework.ide.vscode.commons.languageserver.hover.VscodeHoverEngineAdapter.HoverType; diff --git a/vscode-extensions/vscode-application-properties/src/main/java/org/springframework/ide/vscode/application/properties/completions/PropertiesCompletionProposalsCalculator.java b/vscode-extensions/vscode-boot-properties/src/main/java/org/springframework/ide/vscode/boot/properties/completions/PropertiesCompletionProposalsCalculator.java similarity index 98% rename from vscode-extensions/vscode-application-properties/src/main/java/org/springframework/ide/vscode/application/properties/completions/PropertiesCompletionProposalsCalculator.java rename to vscode-extensions/vscode-boot-properties/src/main/java/org/springframework/ide/vscode/boot/properties/completions/PropertiesCompletionProposalsCalculator.java index 536e85cda..180455e17 100644 --- a/vscode-extensions/vscode-application-properties/src/main/java/org/springframework/ide/vscode/application/properties/completions/PropertiesCompletionProposalsCalculator.java +++ b/vscode-extensions/vscode-boot-properties/src/main/java/org/springframework/ide/vscode/boot/properties/completions/PropertiesCompletionProposalsCalculator.java @@ -1,7 +1,7 @@ -package org.springframework.ide.vscode.application.properties.completions; +package org.springframework.ide.vscode.boot.properties.completions; +import static org.springframework.ide.vscode.boot.properties.tools.CommonLanguageTools.*; import static org.springframework.ide.vscode.commons.util.StringUtil.camelCaseToHyphens; -import static org.springframework.ide.vscode.application.properties.tools.CommonLanguageTools.*; import java.util.ArrayList; import java.util.Collection; @@ -22,7 +22,7 @@ import org.springframework.ide.vscode.application.properties.metadata.types.Type import org.springframework.ide.vscode.application.properties.metadata.types.TypedProperty; import org.springframework.ide.vscode.application.properties.metadata.util.FuzzyMap; import org.springframework.ide.vscode.application.properties.metadata.util.FuzzyMap.Match; -import org.springframework.ide.vscode.application.properties.reconcile.PropertyNavigator; +import org.springframework.ide.vscode.boot.properties.reconcile.PropertyNavigator; import org.springframework.ide.vscode.commons.languageserver.completion.DocumentEdits; import org.springframework.ide.vscode.commons.languageserver.completion.ICompletionProposal; import org.springframework.ide.vscode.commons.languageserver.completion.LazyProposalApplier; diff --git a/vscode-extensions/vscode-application-properties/src/main/java/org/springframework/ide/vscode/application/properties/completions/SpringPropertiesCompletionEngine.java b/vscode-extensions/vscode-boot-properties/src/main/java/org/springframework/ide/vscode/boot/properties/completions/SpringPropertiesCompletionEngine.java similarity index 96% rename from vscode-extensions/vscode-application-properties/src/main/java/org/springframework/ide/vscode/application/properties/completions/SpringPropertiesCompletionEngine.java rename to vscode-extensions/vscode-boot-properties/src/main/java/org/springframework/ide/vscode/boot/properties/completions/SpringPropertiesCompletionEngine.java index 9f48cd85e..a15097f41 100644 --- a/vscode-extensions/vscode-application-properties/src/main/java/org/springframework/ide/vscode/application/properties/completions/SpringPropertiesCompletionEngine.java +++ b/vscode-extensions/vscode-boot-properties/src/main/java/org/springframework/ide/vscode/boot/properties/completions/SpringPropertiesCompletionEngine.java @@ -1,4 +1,4 @@ -package org.springframework.ide.vscode.application.properties.completions; +package org.springframework.ide.vscode.boot.properties.completions; import java.util.Collection; diff --git a/vscode-extensions/vscode-application-properties/src/main/java/org/springframework/ide/vscode/application/properties/hover/PropertiesHoverCalculator.java b/vscode-extensions/vscode-boot-properties/src/main/java/org/springframework/ide/vscode/boot/properties/hover/PropertiesHoverCalculator.java similarity index 94% rename from vscode-extensions/vscode-application-properties/src/main/java/org/springframework/ide/vscode/application/properties/hover/PropertiesHoverCalculator.java rename to vscode-extensions/vscode-boot-properties/src/main/java/org/springframework/ide/vscode/boot/properties/hover/PropertiesHoverCalculator.java index a147ed4e8..620abe1e2 100644 --- a/vscode-extensions/vscode-application-properties/src/main/java/org/springframework/ide/vscode/application/properties/hover/PropertiesHoverCalculator.java +++ b/vscode-extensions/vscode-boot-properties/src/main/java/org/springframework/ide/vscode/boot/properties/hover/PropertiesHoverCalculator.java @@ -1,8 +1,8 @@ -package org.springframework.ide.vscode.application.properties.hover; +package org.springframework.ide.vscode.boot.properties.hover; -import static org.springframework.ide.vscode.application.properties.tools.CommonLanguageTools.SPACES; -import static org.springframework.ide.vscode.application.properties.tools.CommonLanguageTools.getValueHints; -import static org.springframework.ide.vscode.application.properties.tools.CommonLanguageTools.getValueType; +import static org.springframework.ide.vscode.boot.properties.tools.CommonLanguageTools.SPACES; +import static org.springframework.ide.vscode.boot.properties.tools.CommonLanguageTools.getValueHints; +import static org.springframework.ide.vscode.boot.properties.tools.CommonLanguageTools.getValueType; import java.util.Collection; import java.util.Optional; diff --git a/vscode-extensions/vscode-application-properties/src/main/java/org/springframework/ide/vscode/application/properties/hover/PropertiesHoverInfoProvider.java b/vscode-extensions/vscode-boot-properties/src/main/java/org/springframework/ide/vscode/boot/properties/hover/PropertiesHoverInfoProvider.java similarity index 95% rename from vscode-extensions/vscode-application-properties/src/main/java/org/springframework/ide/vscode/application/properties/hover/PropertiesHoverInfoProvider.java rename to vscode-extensions/vscode-boot-properties/src/main/java/org/springframework/ide/vscode/boot/properties/hover/PropertiesHoverInfoProvider.java index fa472b2ab..bd702559c 100644 --- a/vscode-extensions/vscode-application-properties/src/main/java/org/springframework/ide/vscode/application/properties/hover/PropertiesHoverInfoProvider.java +++ b/vscode-extensions/vscode-boot-properties/src/main/java/org/springframework/ide/vscode/boot/properties/hover/PropertiesHoverInfoProvider.java @@ -1,4 +1,4 @@ -package org.springframework.ide.vscode.application.properties.hover; +package org.springframework.ide.vscode.boot.properties.hover; import org.springframework.ide.vscode.application.properties.metadata.SpringPropertyIndexProvider; import org.springframework.ide.vscode.application.properties.metadata.types.TypeUtilProvider; diff --git a/vscode-extensions/vscode-application-properties/src/main/java/org/springframework/ide/vscode/application/properties/quickfix/ReplaceDeprecatedPropertyQuickfix.java b/vscode-extensions/vscode-boot-properties/src/main/java/org/springframework/ide/vscode/boot/properties/quickfix/ReplaceDeprecatedPropertyQuickfix.java similarity index 98% rename from vscode-extensions/vscode-application-properties/src/main/java/org/springframework/ide/vscode/application/properties/quickfix/ReplaceDeprecatedPropertyQuickfix.java rename to vscode-extensions/vscode-boot-properties/src/main/java/org/springframework/ide/vscode/boot/properties/quickfix/ReplaceDeprecatedPropertyQuickfix.java index 9edde6cdf..c07530846 100644 --- a/vscode-extensions/vscode-application-properties/src/main/java/org/springframework/ide/vscode/application/properties/quickfix/ReplaceDeprecatedPropertyQuickfix.java +++ b/vscode-extensions/vscode-boot-properties/src/main/java/org/springframework/ide/vscode/boot/properties/quickfix/ReplaceDeprecatedPropertyQuickfix.java @@ -8,7 +8,7 @@ * Contributors: * Pivotal, Inc. - initial API and implementation *******************************************************************************/ -package org.springframework.ide.vscode.application.properties.quickfix; +package org.springframework.ide.vscode.boot.properties.quickfix; import org.eclipse.lsp4j.CompletionItemKind; import org.springframework.ide.vscode.commons.languageserver.completion.DocumentEdits; diff --git a/vscode-extensions/vscode-application-properties/src/main/java/org/springframework/ide/vscode/application/properties/reconcile/ApplicationPropertiesProblemType.java b/vscode-extensions/vscode-boot-properties/src/main/java/org/springframework/ide/vscode/boot/properties/reconcile/ApplicationPropertiesProblemType.java similarity index 97% rename from vscode-extensions/vscode-application-properties/src/main/java/org/springframework/ide/vscode/application/properties/reconcile/ApplicationPropertiesProblemType.java rename to vscode-extensions/vscode-boot-properties/src/main/java/org/springframework/ide/vscode/boot/properties/reconcile/ApplicationPropertiesProblemType.java index d8f051dbf..e011a0cf4 100644 --- a/vscode-extensions/vscode-application-properties/src/main/java/org/springframework/ide/vscode/application/properties/reconcile/ApplicationPropertiesProblemType.java +++ b/vscode-extensions/vscode-boot-properties/src/main/java/org/springframework/ide/vscode/boot/properties/reconcile/ApplicationPropertiesProblemType.java @@ -8,7 +8,7 @@ * Contributors: * Pivotal, Inc. - initial API and implementation *******************************************************************************/ -package org.springframework.ide.vscode.application.properties.reconcile; +package org.springframework.ide.vscode.boot.properties.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-properties/src/main/java/org/springframework/ide/vscode/application/properties/reconcile/DelimitedListReconciler.java b/vscode-extensions/vscode-boot-properties/src/main/java/org/springframework/ide/vscode/boot/properties/reconcile/DelimitedListReconciler.java similarity index 95% rename from vscode-extensions/vscode-application-properties/src/main/java/org/springframework/ide/vscode/application/properties/reconcile/DelimitedListReconciler.java rename to vscode-extensions/vscode-boot-properties/src/main/java/org/springframework/ide/vscode/boot/properties/reconcile/DelimitedListReconciler.java index f2ed9b5f7..60e8d412b 100644 --- a/vscode-extensions/vscode-application-properties/src/main/java/org/springframework/ide/vscode/application/properties/reconcile/DelimitedListReconciler.java +++ b/vscode-extensions/vscode-boot-properties/src/main/java/org/springframework/ide/vscode/boot/properties/reconcile/DelimitedListReconciler.java @@ -1,4 +1,4 @@ -package org.springframework.ide.vscode.application.properties.reconcile; +package org.springframework.ide.vscode.boot.properties.reconcile; import java.util.Arrays; import java.util.regex.Pattern; diff --git a/vscode-extensions/vscode-application-properties/src/main/java/org/springframework/ide/vscode/application/properties/reconcile/DuplicateNameChecker.java b/vscode-extensions/vscode-boot-properties/src/main/java/org/springframework/ide/vscode/boot/properties/reconcile/DuplicateNameChecker.java similarity index 84% rename from vscode-extensions/vscode-application-properties/src/main/java/org/springframework/ide/vscode/application/properties/reconcile/DuplicateNameChecker.java rename to vscode-extensions/vscode-boot-properties/src/main/java/org/springframework/ide/vscode/boot/properties/reconcile/DuplicateNameChecker.java index 81fc72ffe..3865ef6dd 100644 --- a/vscode-extensions/vscode-application-properties/src/main/java/org/springframework/ide/vscode/application/properties/reconcile/DuplicateNameChecker.java +++ b/vscode-extensions/vscode-boot-properties/src/main/java/org/springframework/ide/vscode/boot/properties/reconcile/DuplicateNameChecker.java @@ -1,7 +1,7 @@ -package org.springframework.ide.vscode.application.properties.reconcile; +package org.springframework.ide.vscode.boot.properties.reconcile; -import static org.springframework.ide.vscode.application.properties.reconcile.ApplicationPropertiesProblemType.PROP_DUPLICATE_KEY; -import static org.springframework.ide.vscode.application.properties.reconcile.SpringPropertyProblem.problem; +import static org.springframework.ide.vscode.boot.properties.reconcile.ApplicationPropertiesProblemType.PROP_DUPLICATE_KEY; +import static org.springframework.ide.vscode.boot.properties.reconcile.SpringPropertyProblem.problem; import java.util.HashMap; import java.util.Map; diff --git a/vscode-extensions/vscode-application-properties/src/main/java/org/springframework/ide/vscode/application/properties/reconcile/PropertyNavigator.java b/vscode-extensions/vscode-boot-properties/src/main/java/org/springframework/ide/vscode/boot/properties/reconcile/PropertyNavigator.java similarity index 97% rename from vscode-extensions/vscode-application-properties/src/main/java/org/springframework/ide/vscode/application/properties/reconcile/PropertyNavigator.java rename to vscode-extensions/vscode-boot-properties/src/main/java/org/springframework/ide/vscode/boot/properties/reconcile/PropertyNavigator.java index 4d7238d85..a3a6e9660 100644 --- a/vscode-extensions/vscode-application-properties/src/main/java/org/springframework/ide/vscode/application/properties/reconcile/PropertyNavigator.java +++ b/vscode-extensions/vscode-boot-properties/src/main/java/org/springframework/ide/vscode/boot/properties/reconcile/PropertyNavigator.java @@ -1,7 +1,7 @@ -package org.springframework.ide.vscode.application.properties.reconcile; +package org.springframework.ide.vscode.boot.properties.reconcile; import static org.springframework.ide.vscode.application.properties.metadata.types.TypeUtil.isBracketable; -import static org.springframework.ide.vscode.application.properties.reconcile.SpringPropertyProblem.problem; +import static org.springframework.ide.vscode.boot.properties.reconcile.SpringPropertyProblem.problem; import java.util.List; diff --git a/vscode-extensions/vscode-application-properties/src/main/java/org/springframework/ide/vscode/application/properties/reconcile/SpringPropertiesReconcileEngine.java b/vscode-extensions/vscode-boot-properties/src/main/java/org/springframework/ide/vscode/boot/properties/reconcile/SpringPropertiesReconcileEngine.java similarity index 91% rename from vscode-extensions/vscode-application-properties/src/main/java/org/springframework/ide/vscode/application/properties/reconcile/SpringPropertiesReconcileEngine.java rename to vscode-extensions/vscode-boot-properties/src/main/java/org/springframework/ide/vscode/boot/properties/reconcile/SpringPropertiesReconcileEngine.java index 26acc6de9..b26ca4825 100644 --- a/vscode-extensions/vscode-application-properties/src/main/java/org/springframework/ide/vscode/application/properties/reconcile/SpringPropertiesReconcileEngine.java +++ b/vscode-extensions/vscode-boot-properties/src/main/java/org/springframework/ide/vscode/boot/properties/reconcile/SpringPropertiesReconcileEngine.java @@ -8,13 +8,12 @@ * Contributors: * Pivotal, Inc. - initial API and implementation *******************************************************************************/ -package org.springframework.ide.vscode.application.properties.reconcile; +package org.springframework.ide.vscode.boot.properties.reconcile; -//import static org.springframework.ide.eclipse.boot.properties.editor.SpringPropertiesCompletionEngine.isAssign; -import static org.springframework.ide.vscode.application.properties.reconcile.ApplicationPropertiesProblemType.PROP_DEPRECATED; -import static org.springframework.ide.vscode.application.properties.reconcile.ApplicationPropertiesProblemType.PROP_SYNTAX_ERROR; -import static org.springframework.ide.vscode.application.properties.reconcile.ApplicationPropertiesProblemType.PROP_UNKNOWN_PROPERTY; -import static org.springframework.ide.vscode.application.properties.reconcile.SpringPropertyProblem.problem; +import static org.springframework.ide.vscode.boot.properties.reconcile.ApplicationPropertiesProblemType.PROP_DEPRECATED; +import static org.springframework.ide.vscode.boot.properties.reconcile.ApplicationPropertiesProblemType.PROP_SYNTAX_ERROR; +import static org.springframework.ide.vscode.boot.properties.reconcile.ApplicationPropertiesProblemType.PROP_UNKNOWN_PROPERTY; +import static org.springframework.ide.vscode.boot.properties.reconcile.SpringPropertyProblem.problem; import static org.springframework.ide.vscode.commons.util.StringUtil.commonPrefix; import java.util.regex.Pattern; @@ -27,7 +26,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.TypeUtilProvider; import org.springframework.ide.vscode.application.properties.metadata.util.FuzzyMap; -import org.springframework.ide.vscode.application.properties.quickfix.ReplaceDeprecatedPropertyQuickfix; +import org.springframework.ide.vscode.boot.properties.quickfix.ReplaceDeprecatedPropertyQuickfix; import org.springframework.ide.vscode.commons.languageserver.reconcile.IProblemCollector; import org.springframework.ide.vscode.commons.languageserver.reconcile.IReconcileEngine; import org.springframework.ide.vscode.commons.languageserver.util.BadLocationException; diff --git a/vscode-extensions/vscode-application-properties/src/main/java/org/springframework/ide/vscode/application/properties/reconcile/SpringPropertyProblem.java b/vscode-extensions/vscode-boot-properties/src/main/java/org/springframework/ide/vscode/boot/properties/reconcile/SpringPropertyProblem.java similarity index 95% rename from vscode-extensions/vscode-application-properties/src/main/java/org/springframework/ide/vscode/application/properties/reconcile/SpringPropertyProblem.java rename to vscode-extensions/vscode-boot-properties/src/main/java/org/springframework/ide/vscode/boot/properties/reconcile/SpringPropertyProblem.java index 2b85f10a8..4d2243ee9 100644 --- a/vscode-extensions/vscode-application-properties/src/main/java/org/springframework/ide/vscode/application/properties/reconcile/SpringPropertyProblem.java +++ b/vscode-extensions/vscode-boot-properties/src/main/java/org/springframework/ide/vscode/boot/properties/reconcile/SpringPropertyProblem.java @@ -1,4 +1,4 @@ -package org.springframework.ide.vscode.application.properties.reconcile; +package org.springframework.ide.vscode.boot.properties.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-application-properties/src/main/java/org/springframework/ide/vscode/application/properties/tools/CommonLanguageTools.java b/vscode-extensions/vscode-boot-properties/src/main/java/org/springframework/ide/vscode/boot/properties/tools/CommonLanguageTools.java similarity index 96% rename from vscode-extensions/vscode-application-properties/src/main/java/org/springframework/ide/vscode/application/properties/tools/CommonLanguageTools.java rename to vscode-extensions/vscode-boot-properties/src/main/java/org/springframework/ide/vscode/boot/properties/tools/CommonLanguageTools.java index f30875eeb..d374d5ac8 100644 --- a/vscode-extensions/vscode-application-properties/src/main/java/org/springframework/ide/vscode/application/properties/tools/CommonLanguageTools.java +++ b/vscode-extensions/vscode-boot-properties/src/main/java/org/springframework/ide/vscode/boot/properties/tools/CommonLanguageTools.java @@ -1,4 +1,4 @@ -package org.springframework.ide.vscode.application.properties.tools; +package org.springframework.ide.vscode.boot.properties.tools; import static org.springframework.ide.vscode.commons.util.StringUtil.camelCaseToHyphens; @@ -16,7 +16,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.EnumCaseMode; import org.springframework.ide.vscode.application.properties.metadata.util.FuzzyMap; -import org.springframework.ide.vscode.application.properties.reconcile.PropertyNavigator; +import org.springframework.ide.vscode.boot.properties.reconcile.PropertyNavigator; import org.springframework.ide.vscode.commons.languageserver.util.DocumentRegion; import org.springframework.ide.vscode.commons.languageserver.util.TextDocument; import org.springframework.ide.vscode.commons.util.CollectionUtil; diff --git a/vscode-extensions/vscode-application-properties/src/test/java/org/springframework/ide/vscode/application/properties/test/ApplicationPropertiesEditorTest.java b/vscode-extensions/vscode-boot-properties/src/test/java/org/springframework/ide/vscode/boot/properties/test/ApplicationPropertiesEditorTest.java similarity index 99% rename from vscode-extensions/vscode-application-properties/src/test/java/org/springframework/ide/vscode/application/properties/test/ApplicationPropertiesEditorTest.java rename to vscode-extensions/vscode-boot-properties/src/test/java/org/springframework/ide/vscode/boot/properties/test/ApplicationPropertiesEditorTest.java index 0a5ca3200..474ca9dd2 100644 --- a/vscode-extensions/vscode-application-properties/src/test/java/org/springframework/ide/vscode/application/properties/test/ApplicationPropertiesEditorTest.java +++ b/vscode-extensions/vscode-boot-properties/src/test/java/org/springframework/ide/vscode/boot/properties/test/ApplicationPropertiesEditorTest.java @@ -8,11 +8,11 @@ * Contributors: * Pivotal, Inc. - initial API and implementation *******************************************************************************/ -package org.springframework.ide.vscode.application.properties.test; +package org.springframework.ide.vscode.boot.properties.test; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; -import static org.springframework.ide.vscode.application.properties.reconcile.ApplicationPropertiesProblemType.PROP_DUPLICATE_KEY; +import static org.springframework.ide.vscode.boot.properties.reconcile.ApplicationPropertiesProblemType.PROP_DUPLICATE_KEY; import static org.springframework.ide.vscode.languageserver.testharness.TestAsserts.assertContains; import java.nio.charset.Charset; @@ -24,9 +24,9 @@ import org.eclipse.lsp4j.CompletionItem; import org.eclipse.lsp4j.Diagnostic; import org.junit.Ignore; import org.junit.Test; -import org.springframework.ide.vscode.application.properties.ApplicationPropertiesLanguageServer; import org.springframework.ide.vscode.application.properties.metadata.CachingValueProvider; import org.springframework.ide.vscode.application.properties.metadata.PropertiesLoader; +import org.springframework.ide.vscode.boot.properties.ApplicationPropertiesLanguageServer; import org.springframework.ide.vscode.commons.java.IJavaProject; import org.springframework.ide.vscode.commons.java.IType; import org.springframework.ide.vscode.commons.languageserver.hover.VscodeHoverEngineAdapter.HoverType; diff --git a/vscode-extensions/vscode-application-properties/src/test/java/org/springframework/ide/vscode/application/properties/test/ApplicationPropertiesLanguageServerTest.java b/vscode-extensions/vscode-boot-properties/src/test/java/org/springframework/ide/vscode/boot/properties/test/ApplicationPropertiesLanguageServerTest.java similarity index 92% rename from vscode-extensions/vscode-application-properties/src/test/java/org/springframework/ide/vscode/application/properties/test/ApplicationPropertiesLanguageServerTest.java rename to vscode-extensions/vscode-boot-properties/src/test/java/org/springframework/ide/vscode/boot/properties/test/ApplicationPropertiesLanguageServerTest.java index 5f911a0f4..bee75b32a 100644 --- a/vscode-extensions/vscode-application-properties/src/test/java/org/springframework/ide/vscode/application/properties/test/ApplicationPropertiesLanguageServerTest.java +++ b/vscode-extensions/vscode-boot-properties/src/test/java/org/springframework/ide/vscode/boot/properties/test/ApplicationPropertiesLanguageServerTest.java @@ -8,7 +8,7 @@ * Contributors: * Pivotal, Inc. - initial API and implementation *******************************************************************************/ -package org.springframework.ide.vscode.application.properties.test; +package org.springframework.ide.vscode.boot.properties.test; import static org.assertj.core.api.Assertions.assertThat; @@ -21,7 +21,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.application.properties.ApplicationPropertiesLanguageServer; +import org.springframework.ide.vscode.boot.properties.ApplicationPropertiesLanguageServer; import org.springframework.ide.vscode.languageserver.testharness.LanguageServerHarness; /**