diff --git a/.vscode/settings.json b/.vscode/settings.json index 074558c5705522fa9c52f0f9d3d4a2e5c3d4b5c8..328f491cc2b73c22c13a470a015ae8750ced2fe4 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -5,6 +5,6 @@ "editor.codeActionsOnSave": { "source.fixAll.eslint": true }, - "proB.wdChecks": false, - "proB.debugMode": false + "prob.wdChecks": false, + "prob.debugMode": false } \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index 75dddd3e419cab92fe9b1f374e372f066f1101aa..2c3db07ed3075d36ab5ce27d30a01a4b00760b31 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1862,21 +1862,21 @@ "integrity": "sha512-YciJxk08iU5LmWu7j5dUt9/1OLjokKET6rME3cI4BRpiF6HZlusm2ZwPt0MYJ0lV5y43sZsQHhyon2xBg4ZJVA==", "requires": { "semver": "^6.3.0", - "vscode-proB-protocol": "^3.15.3" + "vscode-languageserver-protocol": "^3.15.3" } }, - "vscode-proB-protocol": { + "vscode-languageserver-protocol": { "version": "3.15.3", - "resolved": "https://registry.npmjs.org/vscode-proB-protocol/-/vscode-proB-protocol-3.15.3.tgz", + "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.15.3.tgz", "integrity": "sha512-zrMuwHOAQRhjDSnflWdJG+O2ztMWss8GqUUB8dXLR/FPenwkiBNkMIJJYfSN6sgskvsF0rHAoBowNQfbyZnnvw==", "requires": { "vscode-jsonrpc": "^5.0.1", - "vscode-proB-types": "3.15.1" + "vscode-languageserver-types": "3.15.1" } }, - "vscode-proB-types": { + "vscode-languageserver-types": { "version": "3.15.1", - "resolved": "https://registry.npmjs.org/vscode-proB-types/-/vscode-proB-types-3.15.1.tgz", + "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.15.1.tgz", "integrity": "sha512-+a9MPUQrNGRrGU630OGbYVQ+11iOIovjCkqxajPa9w57Sd5ruK8WQNsslzpa0x/QJqC8kRc2DUxWjIFwoNm4ZQ==" }, "vscode-read-manifest": { diff --git a/package.json b/package.json index a37c8f582c2be44be41ea91cb622d89fcf0a0c6b..07182fedad3ceaa1653380830303b9b1f19edf61 100644 --- a/package.json +++ b/package.json @@ -32,23 +32,23 @@ "type": "object", "title": "Configuration", "properties": { - "proB.probHome": { + "languageServer.proBHome": { "id": "1", - "title": "ProBHome", + "title": "ProB Home", "scope": "application", "type": "string", - "default": "~/prob_prolog/probcli.sh", - "description": "Path to ProB executable" + "default": "~/prob_prolog/", + "description": "Path to ProB directory" }, - "proB.wdChecks": { + "languageServer.wdChecks": { "id": "2", "title": "WD Checks", - "scope": "window", + "scope": "application", "type": "boolean", "default": true, "description": "Option for WD Checks" }, - "proB.strictChecks": { + "languageServer.strictChecks": { "id": "3", "title": "Strict Checks", "scope": "application", @@ -56,7 +56,7 @@ "default": true, "description": "Option for stricter Checks" }, - "proB.performanceHints": { + "languageServer.performanceHints": { "id": "4", "title": "Performance Hints", "scope": "application", @@ -64,7 +64,7 @@ "default": true, "description": "Option for performance-related Hints" }, - "proB.debugMode": { + "languageServer.debugMode": { "id": "5", "title": "Debug Mode", "scope": "application", @@ -170,6 +170,7 @@ "ts-xor": "^1.0.8", "vscode-api": "0.0.0", "vscode-languageclient": "^6.1.3", + "vscode-languageserver-protocol": "^3.15.3", "vscode-read-manifest": "^0.5.1", "vscode-test": "^1.4.0", "vscode-uri": "^2.1.2", diff --git a/src/extension.ts b/src/extension.ts index 0b20bd57903f609a95b6f87aec5d525ee079d231..11a801861d3588e7e5e4e93bf37d56075225f9ca 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -33,15 +33,14 @@ export function activate(context: ExtensionContext) { //Start the server // comment the two lines (and the closing brackets) if you want to run a server by hand -> for developing - let prc = spawn(javaHome, ['-jar', serverHome]) +// let prc = spawn(javaHome, ['-jar', serverHome]) - prc.stdout.on('data', function (data) { +// prc.stdout.on('data', function (data) { let connectionInfo = { port: 55555, } - console.log(javaHome, ['-jar', serverHome]) let serverOptions: ServerOptions = () => { @@ -74,22 +73,24 @@ export function activate(context: ExtensionContext) { } // Create the language client and start the client. - client = new LanguageClient('languageServer', 'Language Server', serverOptions, clientOptions) + client = new LanguageClient('languageServer', 'languageServer', serverOptions, clientOptions) let item = window.createStatusBarItem(StatusBarAlignment.Right, Number.MIN_VALUE); debugChannle.appendLine("starting server: " + javaHome + " -jar " + serverHome) - console.log(prc.pid) item.text = 'Starting ProB LSP...'; toggleItem(window.activeTextEditor, item); - // Start the client. This will also launch the server + // Start the clienServert. This will also launch the server let disposable = client.start(); context.subscriptions.push(disposable); + console.log( workspace.getConfiguration()) + console.log( workspace.getConfiguration("languageServer")) + const debugMode: Boolean = workspace.getConfiguration("languageServer").get("debugMode") if (!debugMode) { debugChannle.hide() @@ -97,13 +98,13 @@ export function activate(context: ExtensionContext) { debugChannle.show() } - //console.log(workspace.getConfiguration("languageServer").get("debugMode")) + window.onDidOpenTerminal(() => { showDebugMessages(debugChannle) }) - }) + //}) }