From e282f69a9a6dc13fe6c6ad45eb0145caf3792609 Mon Sep 17 00:00:00 2001
From: SeeBasTStick <sebastian.stock@hhu.de>
Date: Tue, 20 Oct 2020 08:48:23 +0200
Subject: [PATCH] prepared v.2.0.0 with defult parameter
---
.vscode/settings.json | 4 +-
CHANGELOG.md | 1 -
README.md | 1 -
package-lock.json | 87 +++++++++++++++++++++++++++----------------
package.json | 6 +--
src/extension.ts | 8 ++--
6 files changed, 63 insertions(+), 44 deletions(-)
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 328f491..9446fa3 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -4,7 +4,5 @@
"typescript.preferences.quoteStyle": "single",
"editor.codeActionsOnSave": {
"source.fixAll.eslint": true
- },
- "prob.wdChecks": false,
- "prob.debugMode": false
+ }
}
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a7d2437..2c26dfa 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -97,5 +97,4 @@
## [2.0.0]
- keyword support for new proB features: REAL, real, floor, ceiling
-- renamed settings from 'languageServer' to 'prob'
- now uses prob2_kernel library instead of calling prob_cli direc; leads to noticable performance gain after initial warm up
\ No newline at end of file
diff --git a/README.md b/README.md
index 18d92df..ae6d42c 100644
--- a/README.md
+++ b/README.md
@@ -43,5 +43,4 @@ The language server can be found here https://github.com/SeeBasTStick/b-language
### 2.0.0
- keyword support for new proB features: REAL, real, floor, ceiling
-- renamed settings from 'languageserver' to 'prob'
- now uses prob2_kernel library instead of calling prob_cli direc; leads to noticable performance gain after initial warm up
\ No newline at end of file
diff --git a/package-lock.json b/package-lock.json
index 2c3db07..a60d9e9 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -61,12 +61,6 @@
"strip-json-comments": "^3.1.1"
}
},
- "@types/color-name": {
- "version": "1.1.1",
- "resolved": "https://registry.npmjs.org/@types/color-name/-/color-name-1.1.1.tgz",
- "integrity": "sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ==",
- "dev": true
- },
"@types/eslint-visitor-keys": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/@types/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz",
@@ -95,9 +89,9 @@
}
},
"@types/node": {
- "version": "14.11.2",
- "resolved": "https://registry.npmjs.org/@types/node/-/node-14.11.2.tgz",
- "integrity": "sha512-jiE3QIxJ8JLNcb1Ps6rDbysDhN4xa8DJJvuC9prr6w+1tIh+QAbYyNF3tyiZNLDBIuBCf4KEcV2UvQm/V60xfA=="
+ "version": "14.11.10",
+ "resolved": "https://registry.npmjs.org/@types/node/-/node-14.11.10.tgz",
+ "integrity": "sha512-yV1nWZPlMFpoXyoknm4S56y2nlTAuFYaJuQtYRAOU7xA/FJ9RY0Xm7QOkaYMMmr8ESdHIuUb6oQgR/0+2NqlyA=="
},
"@types/stream-to-array": {
"version": "2.3.0",
@@ -116,9 +110,9 @@
}
},
"@types/vscode": {
- "version": "1.49.0",
- "resolved": "https://registry.npmjs.org/@types/vscode/-/vscode-1.49.0.tgz",
- "integrity": "sha512-wfNQmLmm1VdMBr6iuNdprWmC1YdrgZ9dQzadv+l2eSjJlElOdJw8OTm4RU4oGTBcfvG6RZI2jOcppkdSS18mZw=="
+ "version": "1.50.0",
+ "resolved": "https://registry.npmjs.org/@types/vscode/-/vscode-1.50.0.tgz",
+ "integrity": "sha512-QnIeyi4L2DiD9M2bAQKRzT/EQvc80qP9UL6JD5TiLlNRL1khIDg4ej4mDSRbtFrDAsRntFI1RhMvdomUThMsqg=="
},
"@typescript-eslint/experimental-utils": {
"version": "2.34.0",
@@ -168,9 +162,9 @@
}
},
"acorn": {
- "version": "7.4.0",
- "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.0.tgz",
- "integrity": "sha512-+G7P8jJmCHr+S+cLfQxygbWhXy+8YTVGzAkpEbcLo2mLoL7tij/VG41QSHACSf5QgYRhMZYHuNc6drJaO0Da+w==",
+ "version": "7.4.1",
+ "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
+ "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
"dev": true
},
"acorn-jsx": {
@@ -188,9 +182,9 @@
}
},
"ajv": {
- "version": "6.12.5",
- "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.5.tgz",
- "integrity": "sha512-lRF8RORchjpKG50/WFf8xmg7sgCLFiYNNnqdKflk63whMQcWR5ngGjiSXkL9bjxy6B2npOK2HSMN49jEBMSkag==",
+ "version": "6.12.6",
+ "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+ "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
"dev": true,
"requires": {
"fast-deep-equal": "^3.1.1",
@@ -256,11 +250,8 @@
"integrity": "sha1-rqdNXmHB+JlhO/ZL2mbUx48v0X0="
},
"b-language-server": {
- "version": "https://github.com/SeeBasTStick/b-language-server/archive/v1.5.0.tar.gz",
- "integrity": "sha512-xZqfo7KpWsaQlUZsHEDbzWQ2jT6RIH4pRRIpaTo7Xa8TSExA1uUPkwIKQURPCWB2rMz04FFetYcbM3NwofxcOw==",
- "requires": {
- "run-script-os": "^1.1.1"
- }
+ "version": "https://github.com/SeeBasTStick/b-language-server/archive/v2.0.2.tar.gz",
+ "integrity": "sha512-ZgexzCtfT3Vfr4isZU3ypSszriNaCW4HsKdH+cXBuqfAN+pXE3wqH/uKz2Rw+TzNBy3m6FockjHqDDZXrU1x/A=="
},
"balanced-match": {
"version": "1.0.0",
@@ -327,12 +318,11 @@
},
"dependencies": {
"ansi-styles": {
- "version": "4.2.1",
- "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
- "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
+ "version": "4.3.0",
+ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+ "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
"dev": true,
"requires": {
- "@types/color-name": "^1.1.1",
"color-convert": "^2.0.1"
}
},
@@ -604,9 +594,9 @@
"dev": true
},
"eslint": {
- "version": "7.9.0",
- "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.9.0.tgz",
- "integrity": "sha512-V6QyhX21+uXp4T+3nrNfI3hQNBDa/P8ga7LoQOenwrlEFXrEnUEE+ok1dMtaS3b6rmLXhT1TkTIsG75HMLbknA==",
+ "version": "7.11.0",
+ "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.11.0.tgz",
+ "integrity": "sha512-G9+qtYVCHaDi1ZuWzBsOWo2wSwd70TXnU6UHA3cTYHp7gCTXZcpggWFoUVAMRarg68qtPoNfFbzPh+VdOgmwmw==",
"dev": true,
"requires": {
"@babel/code-frame": "^7.0.0",
@@ -617,9 +607,9 @@
"debug": "^4.0.1",
"doctrine": "^3.0.0",
"enquirer": "^2.3.5",
- "eslint-scope": "^5.1.0",
+ "eslint-scope": "^5.1.1",
"eslint-utils": "^2.1.0",
- "eslint-visitor-keys": "^1.3.0",
+ "eslint-visitor-keys": "^2.0.0",
"espree": "^7.3.0",
"esquery": "^1.2.0",
"esutils": "^2.0.2",
@@ -648,6 +638,39 @@
"v8-compile-cache": "^2.0.3"
},
"dependencies": {
+ "eslint-scope": {
+ "version": "5.1.1",
+ "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
+ "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
+ "dev": true,
+ "requires": {
+ "esrecurse": "^4.3.0",
+ "estraverse": "^4.1.1"
+ }
+ },
+ "eslint-visitor-keys": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.0.0.tgz",
+ "integrity": "sha512-QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ==",
+ "dev": true
+ },
+ "esrecurse": {
+ "version": "4.3.0",
+ "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
+ "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
+ "dev": true,
+ "requires": {
+ "estraverse": "^5.2.0"
+ },
+ "dependencies": {
+ "estraverse": {
+ "version": "5.2.0",
+ "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz",
+ "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==",
+ "dev": true
+ }
+ }
+ },
"semver": {
"version": "7.3.2",
"resolved": "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz",
diff --git a/package.json b/package.json
index 07182fe..35cb754 100644
--- a/package.json
+++ b/package.json
@@ -37,8 +37,8 @@
"title": "ProB Home",
"scope": "application",
"type": "string",
- "default": "~/prob_prolog/",
- "description": "Path to ProB directory"
+ "default": "DEFAULT",
+ "description": "Path to ProB directory. Use 'DEFAULT' to access the shipped version."
},
"languageServer.wdChecks": {
"id": "2",
@@ -156,7 +156,7 @@
"@types/ndjson": "^1.5.0",
"@types/stream-to-array": "^2.3.0",
"@types/vscode": "^1.49.0",
- "b-language-server": "https://github.com/SeeBasTStick/b-language-server/archive/v1.5.0.tar.gz",
+ "b-language-server": "https://github.com/SeeBasTStick/b-language-server/archive/v2.0.2.tar.gz",
"clean": "^4.0.2",
"error": "^10.4.0",
"fs": "0.0.1-security",
diff --git a/src/extension.ts b/src/extension.ts
index a664706..3481592 100644
--- a/src/extension.ts
+++ b/src/extension.ts
@@ -32,12 +32,12 @@ 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,
+ port: 55556,
}
@@ -104,7 +104,7 @@ export function activate(context: ExtensionContext) {
showDebugMessages(debugChannle)
})
- })
+// })
}
--
GitLab