From e1fd0cec63a275f99bcdedb29296956a69e0490b Mon Sep 17 00:00:00 2001 From: Kris De Volder Date: Wed, 21 Feb 2018 11:03:56 -0800 Subject: [PATCH] Replace vscode-boot-properties with a dummy extension that shows a warning The warning informs the user the extension is obsolete and to install vscode-spring-boot instead. --- .../vscode-boot-properties/lib/Main.ts | 15 ++++---------- .../vscode-boot-properties/package.json | 16 +-------------- .../scripts/preinstall.sh | 20 ------------------- 3 files changed, 5 insertions(+), 46 deletions(-) delete mode 100755 vscode-extensions/vscode-boot-properties/scripts/preinstall.sh diff --git a/vscode-extensions/vscode-boot-properties/lib/Main.ts b/vscode-extensions/vscode-boot-properties/lib/Main.ts index e835c6aee..c13059d36 100644 --- a/vscode-extensions/vscode-boot-properties/lib/Main.ts +++ b/vscode-extensions/vscode-boot-properties/lib/Main.ts @@ -17,15 +17,8 @@ const YAML_LANGUAGE_ID = "spring-boot-properties-yaml"; /** Called when extension is activated */ export function activate(context: VSCode.ExtensionContext) { - let options : commons.ActivatorOptions = { - DEBUG: false, - CONNECT_TO_LS: false, - extensionId: 'vscode-boot-properties', - launcher: (context: VSCode.ExtensionContext) => Path.resolve(context.extensionPath, 'jars/language-server.jar'), - jvmHeap: "160m", - clientOptions: { - documentSelector: [ PROPERTIES_LANGUAGE_ID, YAML_LANGUAGE_ID ] - } - }; - let clientPromise = commons.activate(options, context); + VSCode.window.showInformationMessage( + "The `vscode-boot-properties` extension is obsolete and no longer functional. "+ + "Please uninstall it and install the `vscode-spring-boot` extension instead." + ); } diff --git a/vscode-extensions/vscode-boot-properties/package.json b/vscode-extensions/vscode-boot-properties/package.json index 4b90ebffe..c18cd0ea0 100644 --- a/vscode-extensions/vscode-boot-properties/package.json +++ b/vscode-extensions/vscode-boot-properties/package.json @@ -52,18 +52,6 @@ ], "configuration": "./properties-support/language-configuration.json" } - ], - "grammars": [ - { - "language": "spring-boot-properties-yaml", - "scopeName": "source.yaml", - "path": "./yaml-support/yaml.tmLanguage" - }, - { - "language": "spring-boot-properties", - "scopeName": "source.java-properties", - "path": "./properties-support/java-properties.tmLanguage" - } ] }, "main": "./out/lib/Main", @@ -72,13 +60,11 @@ "compile": "tsc -p ./", "watch": "tsc -watch -p ./", "clean": "rm -fr node_modules out *.vsix package-lock.json", - "preinstall": "./scripts/preinstall.sh", "postinstall": "node ./node_modules/vscode/bin/install", "vsce-package": "vsce package" }, "dependencies": { - "vscode-languageclient": "^3.4.2", - "commons-vscode": "0.1.4" + "vscode-languageclient": "^3.4.2" }, "devDependencies": { "vsce": "^1.36.1", diff --git a/vscode-extensions/vscode-boot-properties/scripts/preinstall.sh b/vscode-extensions/vscode-boot-properties/scripts/preinstall.sh deleted file mode 100755 index fb39d0edf..000000000 --- a/vscode-extensions/vscode-boot-properties/scripts/preinstall.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/bash -set -e - -workdir=`pwd` - -# Preinstall commons-vscode package -(cd ../commons-vscode ; npm install ; npm pack) -npm install ../commons-vscode/commons-vscode-*.tgz - -# Copy grammar files for .properties and .yml format -curl https://raw.githubusercontent.com/textmate/yaml.tmbundle/master/Syntaxes/YAML.tmLanguage > yaml-support/yaml.tmLanguage -curl https://raw.githubusercontent.com/textmate/java.tmbundle/master/Syntaxes/JavaProperties.plist > properties-support/java-properties.tmLanguage - -# Use maven to build fat jar of the language server -cd ../../headless-services/boot-properties-language-server -./build.sh - -mkdir -p ${workdir}/jars -cp target/*.jar ${workdir}/jars/language-server.jar -