diff --git a/vscode-extensions/vscode-boot-java/lib/Main.ts b/vscode-extensions/vscode-boot-java/lib/Main.ts index 8704ca531..eb199cf1c 100644 --- a/vscode-extensions/vscode-boot-java/lib/Main.ts +++ b/vscode-extensions/vscode-boot-java/lib/Main.ts @@ -1,48 +1,11 @@ 'use strict'; -import * as net from 'net'; - 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 { workspace, TextDocument } from 'vscode'; -import { Trace } from 'vscode-jsonrpc'; - -import * as commons from 'commons-vscode'; -import { connect } from 'tls'; +/** Called when extension is activated */ export function activate(context: VSCode.ExtensionContext) { - let options: commons.ActivatorOptions = { - DEBUG: false, - CONNECT_TO_LS: false, - extensionId: 'boot-java', - preferJdk: true, - launcher: (context: VSCode.ExtensionContext) => 'org.springframework.boot.loader.JarLauncher', - classpath: (context: VSCode.ExtensionContext, jvm: commons.JVM) => { - const classpath = [ - Path.resolve(context.extensionPath, 'jars/language-server.jar') - ]; - if (!jvm.isJdk()) { - VSCode.window.showWarningMessage('JAVA_HOME or PATH environment variable seems to point to a JRE. A JDK is required, hence Boot Hints are unavailable.'); - } - const toolsJar = jvm.getToolsJar(); - if (toolsJar) { - classpath.unshift(toolsJar); - } - return classpath; - }, - clientOptions: { - documentSelector: ['java'], - synchronize: { - configurationSection: 'boot-java' - }, - initializationOptions: { - workspaceFolders: workspace.workspaceFolders ? workspace.workspaceFolders.map(f => f.uri.toString()) : null - }, - } - }; - commons.activate(options, context); + VSCode.window.showInformationMessage( + "The `vscode-boot-java` 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-java/package.json b/vscode-extensions/vscode-boot-java/package.json index 16c4520f3..313a3a459 100644 --- a/vscode-extensions/vscode-boot-java/package.json +++ b/vscode-extensions/vscode-boot-java/package.json @@ -25,31 +25,16 @@ "activationEvents": [ "onLanguage:java" ], - "contributes": { - "configuration": { - "type": "object", - "title": "Boot-Java Configuration", - "properties": { - "boot-java.boot-hints.on": { - "type": "boolean", - "default": true, - "description": "Enable/Disable Spring running Boot application live hints decorators in the source code" - } - } - } - }, "main": "./out/lib/Main", "scripts": { "vscode:prepublish": "npm run compile", "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": { - "commons-vscode": "file:../commons-vscode/commons-vscode-0.1.4.tgz", "vscode-languageclient": "^3.4.5" }, "devDependencies": { diff --git a/vscode-extensions/vscode-boot-java/scripts/preinstall.sh b/vscode-extensions/vscode-boot-java/scripts/preinstall.sh deleted file mode 100755 index 63f3a81ca..000000000 --- a/vscode-extensions/vscode-boot-java/scripts/preinstall.sh +++ /dev/null @@ -1,16 +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 - -# Use maven to build fat jar of the language server -cd ../../headless-services/boot-java-language-server -./build.sh - -mkdir -p ${workdir}/jars -cp target/*.jar ${workdir}/jars/language-server.jar - diff --git a/vscode-extensions/vscode-boot-properties/lib/Main.ts b/vscode-extensions/vscode-boot-properties/lib/Main.ts index 179951189..8d4bc420d 100644 --- a/vscode-extensions/vscode-boot-properties/lib/Main.ts +++ b/vscode-extensions/vscode-boot-properties/lib/Main.ts @@ -1,12 +1,7 @@ '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'; -const PROPERTIES_LANGUAGE_ID = "spring-boot-properties"; -const YAML_LANGUAGE_ID = "spring-boot-properties-yaml"; - /** Called when extension is activated */ export function activate(context: VSCode.ExtensionContext) { VSCode.window.showInformationMessage(