diff --git a/CHANGELOG.md b/CHANGELOG.md index 54528c15285038c6eca56efeaba59ebb03ac8e7b..ef7b0ff8f2098b9ad19d4e31b3dcf69e0f544980 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,4 +3,9 @@ ## [0.0.1] -- first prototype version \ No newline at end of file +- first prototype version + + +## [0.0.2] + +- option to add cutom path \ No newline at end of file diff --git a/README.md b/README.md index cfd1ef4ce7441d7392a2574ac5ff8b3555c82dff..dc40158b450e0dfd148759bdbd8ddc887cc42c6a 100644 --- a/README.md +++ b/README.md @@ -14,17 +14,13 @@ Compiler support for b/eventb via ProB. You need a build a version of ProB downl ## Extension Settings -Include if your extension adds any VS Code settings through the `contributes.configuration` extension point. - -For example: - This extension contributes the following settings: -* `myExtension.enable`: enable/disable this extension -* `myExtension.thing`: set to `blah` to do something +* `languageServer.probHome`: to set the path to ProB + ## Bugs -- please opne an issue at https://github.com/SeeBasTStick/b-eventb-language-extension +- please open an issue at https://github.com/SeeBasTStick/b-eventb-language-extension ## Future plans @@ -33,6 +29,11 @@ This extension contributes the following settings: ## Release Notes + ### 0.0.1 -- First prototype minimum features \ No newline at end of file +- First prototype minimum features + +### 0.0.2 + +- Added option to set ProB path \ No newline at end of file diff --git a/client/src/extension.ts b/client/src/extension.ts index ddaf6c6bfc2800857a72c503af445c14aaf8fc8f..ae78b89335c9aaa94d44719476137e6179a513a1 100644 --- a/client/src/extension.ts +++ b/client/src/extension.ts @@ -48,7 +48,7 @@ export function activate(context: ExtensionContext) { // Create the language client and start the client. client = new LanguageClient( - 'languageServerExample', + 'languageServer', 'Language Server Example', serverOptions, clientOptions diff --git a/package.json b/package.json index 592baab2d6f615f0627475fbd484841ed1a14d8e..ab14955a490fee275f6fb022aacc0576465c9586 100644 --- a/package.json +++ b/package.json @@ -26,15 +26,15 @@ "contributes": { "configuration": { "type": "object", - "title": "Example configuration", + "title": "Configuration", "properties": { - "languageServerExample.maxNumberOfProblems": { + "languageServer.maxNumberOfProblems": { "scope": "resource", "type": "number", "default": 100, "description": "Controls the maximum number of problems produced by the server." }, - "languageServerExample.trace.server": { + "languageServer.trace.server": { "scope": "window", "type": "string", "enum": [ @@ -45,7 +45,8 @@ "default": "off", "description": "Traces the communication between VS Code and the language server." }, - "languageServerExample.probHome":{ + "languageServer.probHome":{ + "scope": "window", "type":"string", "default":"~/prob_prolog/probcli.sh", "description": "Path to ProB executable" @@ -53,6 +54,7 @@ } } }, + "scripts": { "vscode:prepublish": "npm run compile", "compile": "tsc -b", diff --git a/server/src/server.ts b/server/src/server.ts index 7d7c96cab9fd602f1a610229769b2a3a9e9c3df2..23cc5eb620655c1bd14d383a546a494413a19ea6 100644 --- a/server/src/server.ts +++ b/server/src/server.ts @@ -108,7 +108,7 @@ connection.onDidChangeConfiguration(change => { documentSettings.clear(); } else { globalSettings = <ExampleSettings>( - (change.settings.languageServerExample || defaultSettings) + (change.settings.languageServer || defaultSettings) ); } @@ -124,7 +124,7 @@ function getDocumentSettings(resource: string): Thenable<ExampleSettings> { if (!result) { result = connection.workspace.getConfiguration({ scopeUri: resource, - section: 'languageServerExample' + section: 'languageServer' }); documentSettings.set(resource, result); }