From 904e3ffd998fe2827789018468c56a8ad306b5b0 Mon Sep 17 00:00:00 2001 From: Steven Looman Date: Thu, 26 May 2022 17:25:44 +0200 Subject: [PATCH] Continuing development --- CHANGES.md | 3 +++ magik-checks/pom.xml | 2 +- magik-debug-adapter/pom.xml | 2 +- magik-language-server/client-vscode/client/package-lock.json | 2 +- magik-language-server/client-vscode/client/package.json | 2 +- .../client-vscode/client/src/debug-provider.ts | 2 +- .../client-vscode/client/src/language-client.ts | 2 +- magik-language-server/client-vscode/package-lock.json | 5 +++-- magik-language-server/client-vscode/package.json | 2 +- .../client-vscode/server/magik-debug-adapter-0.5.2.jar | 1 - .../server/magik-debug-adapter-0.5.3-SNAPSHOT.jar | 1 + .../client-vscode/server/magik-language-server-0.5.2.jar | 1 - .../server/magik-language-server-0.5.3-SNAPSHOT.jar | 1 + magik-language-server/pom.xml | 2 +- magik-lint/pom.xml | 2 +- magik-squid/pom.xml | 2 +- magik-typed-checks/pom.xml | 2 +- pom.xml | 2 +- sonar-magik-plugin/pom.xml | 2 +- sslr-magik-toolkit/pom.xml | 2 +- 20 files changed, 22 insertions(+), 18 deletions(-) delete mode 120000 magik-language-server/client-vscode/server/magik-debug-adapter-0.5.2.jar create mode 120000 magik-language-server/client-vscode/server/magik-debug-adapter-0.5.3-SNAPSHOT.jar delete mode 120000 magik-language-server/client-vscode/server/magik-language-server-0.5.2.jar create mode 120000 magik-language-server/client-vscode/server/magik-language-server-0.5.3-SNAPSHOT.jar diff --git a/CHANGES.md b/CHANGES.md index ca2f5461..e1dc5d06 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,6 +1,9 @@ Changes ======= +0.5.3 (unreleased) + + 0.5.2 (2022-05-26) - Fix bug in ScopeBuilderVisitor where import in top level procedure caused a NPE diff --git a/magik-checks/pom.xml b/magik-checks/pom.xml index 0683cdf9..5d88e0dc 100644 --- a/magik-checks/pom.xml +++ b/magik-checks/pom.xml @@ -5,7 +5,7 @@ nl.ramsolutions magik-tools - 0.5.2 + 0.5.3-SNAPSHOT magik-checks diff --git a/magik-debug-adapter/pom.xml b/magik-debug-adapter/pom.xml index 19c6b863..209cb51f 100644 --- a/magik-debug-adapter/pom.xml +++ b/magik-debug-adapter/pom.xml @@ -5,7 +5,7 @@ nl.ramsolutions magik-tools - 0.5.2 + 0.5.3-SNAPSHOT magik-debug-adapter diff --git a/magik-language-server/client-vscode/client/package-lock.json b/magik-language-server/client-vscode/client/package-lock.json index deb8c0f7..4df75161 100644 --- a/magik-language-server/client-vscode/client/package-lock.json +++ b/magik-language-server/client-vscode/client/package-lock.json @@ -1,6 +1,6 @@ { "name": "magik-language-server-client", - "version": "0.5.2", + "version": "0.5.3-SNAPSHOT", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/magik-language-server/client-vscode/client/package.json b/magik-language-server/client-vscode/client/package.json index 8f66b4f1..44fee031 100644 --- a/magik-language-server/client-vscode/client/package.json +++ b/magik-language-server/client-vscode/client/package.json @@ -3,7 +3,7 @@ "description": "Magik Language Server and Debug Adapter client for VSCode", "author": "Steven Looman", "license": "GPL-3.0-only", - "version": "0.5.2", + "version": "0.5.3-SNAPSHOT", "publisher": "StevenLooman", "repository": { "type": "git", diff --git a/magik-language-server/client-vscode/client/src/debug-provider.ts b/magik-language-server/client-vscode/client/src/debug-provider.ts index 393265ae..48078846 100644 --- a/magik-language-server/client-vscode/client/src/debug-provider.ts +++ b/magik-language-server/client-vscode/client/src/debug-provider.ts @@ -31,7 +31,7 @@ class DebugAdapterExecutableFactory implements vscode.DebugAdapterDescriptorFact vscode.window.showWarningMessage('Could locate java executable, either set Java Home setting ("magik.javaHome") or JAVA_HOME environment variable.'); return; } - const jar = path.join(__dirname, '..', '..', 'server', 'magik-debug-adapter-0.5.2.jar'); + const jar = path.join(__dirname, '..', '..', 'server', 'magik-debug-adapter-0.5.3-SNAPSHOT.jar'); const javaDebuggerOptions = '-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,quiet=y,address=5006'; const command = javaExec.toString(); diff --git a/magik-language-server/client-vscode/client/src/language-client.ts b/magik-language-server/client-vscode/client/src/language-client.ts index 2741bfb2..8a00a4f7 100644 --- a/magik-language-server/client-vscode/client/src/language-client.ts +++ b/magik-language-server/client-vscode/client/src/language-client.ts @@ -41,7 +41,7 @@ export class MagikLanguageClient implements vscode.Disposable { vscode.window.showWarningMessage('Could locate java executable, either set Java Home setting ("magik.javaHome") or JAVA_HOME environment variable.'); return; } - const jar = path.join(__dirname, '..', '..', 'server', 'magik-language-server-0.5.2.jar'); + const jar = path.join(__dirname, '..', '..', 'server', 'magik-language-server-0.5.3-SNAPSHOT.jar'); const javaDebuggerOptions = '-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,quiet=y,address=5005'; const serverOptions: vscodeLanguageClient.ServerOptions = { diff --git a/magik-language-server/client-vscode/package-lock.json b/magik-language-server/client-vscode/package-lock.json index 506cb8cf..e409ef60 100644 --- a/magik-language-server/client-vscode/package-lock.json +++ b/magik-language-server/client-vscode/package-lock.json @@ -1,6 +1,6 @@ { "name": "magik-language-server", - "version": "0.5.2", + "version": "0.5.3-SNAPSHOT", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -137,7 +137,8 @@ "ansi-regex": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", - "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==" + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "dev": true }, "ansi-styles": { "version": "3.2.1", diff --git a/magik-language-server/client-vscode/package.json b/magik-language-server/client-vscode/package.json index 6d64965e..ac646358 100644 --- a/magik-language-server/client-vscode/package.json +++ b/magik-language-server/client-vscode/package.json @@ -3,7 +3,7 @@ "description": "Magik Language Server", "author": "Steven Looman", "license": "GPL-3.0-only", - "version": "0.5.2", + "version": "0.5.3-SNAPSHOT", "repository": { "type": "git", "url": "https://github.com/StevenLooman/magik-tools" diff --git a/magik-language-server/client-vscode/server/magik-debug-adapter-0.5.2.jar b/magik-language-server/client-vscode/server/magik-debug-adapter-0.5.2.jar deleted file mode 120000 index 7dda72cf..00000000 --- a/magik-language-server/client-vscode/server/magik-debug-adapter-0.5.2.jar +++ /dev/null @@ -1 +0,0 @@ -../../../magik-debug-adapter/target/magik-debug-adapter-0.5.2.jar \ No newline at end of file diff --git a/magik-language-server/client-vscode/server/magik-debug-adapter-0.5.3-SNAPSHOT.jar b/magik-language-server/client-vscode/server/magik-debug-adapter-0.5.3-SNAPSHOT.jar new file mode 120000 index 00000000..451466c7 --- /dev/null +++ b/magik-language-server/client-vscode/server/magik-debug-adapter-0.5.3-SNAPSHOT.jar @@ -0,0 +1 @@ +../../../magik-debug-adapter/target/magik-debug-adapter-0.5.3-SNAPSHOT.jar \ No newline at end of file diff --git a/magik-language-server/client-vscode/server/magik-language-server-0.5.2.jar b/magik-language-server/client-vscode/server/magik-language-server-0.5.2.jar deleted file mode 120000 index b8c22c65..00000000 --- a/magik-language-server/client-vscode/server/magik-language-server-0.5.2.jar +++ /dev/null @@ -1 +0,0 @@ -../../../magik-language-server/target/magik-language-server-0.5.2.jar \ No newline at end of file diff --git a/magik-language-server/client-vscode/server/magik-language-server-0.5.3-SNAPSHOT.jar b/magik-language-server/client-vscode/server/magik-language-server-0.5.3-SNAPSHOT.jar new file mode 120000 index 00000000..dffc68f5 --- /dev/null +++ b/magik-language-server/client-vscode/server/magik-language-server-0.5.3-SNAPSHOT.jar @@ -0,0 +1 @@ +../../../magik-language-server/target/magik-language-server-0.5.3-SNAPSHOT.jar \ No newline at end of file diff --git a/magik-language-server/pom.xml b/magik-language-server/pom.xml index 1b0907ac..687cd782 100644 --- a/magik-language-server/pom.xml +++ b/magik-language-server/pom.xml @@ -5,7 +5,7 @@ nl.ramsolutions magik-tools - 0.5.2 + 0.5.3-SNAPSHOT magik-language-server diff --git a/magik-lint/pom.xml b/magik-lint/pom.xml index 1f771aa1..46403a77 100644 --- a/magik-lint/pom.xml +++ b/magik-lint/pom.xml @@ -5,7 +5,7 @@ nl.ramsolutions magik-tools - 0.5.2 + 0.5.3-SNAPSHOT magik-lint diff --git a/magik-squid/pom.xml b/magik-squid/pom.xml index 086610f0..c1819228 100644 --- a/magik-squid/pom.xml +++ b/magik-squid/pom.xml @@ -5,7 +5,7 @@ nl.ramsolutions magik-tools - 0.5.2 + 0.5.3-SNAPSHOT magik-squid diff --git a/magik-typed-checks/pom.xml b/magik-typed-checks/pom.xml index d6d07e9b..2ddd9f93 100644 --- a/magik-typed-checks/pom.xml +++ b/magik-typed-checks/pom.xml @@ -5,7 +5,7 @@ nl.ramsolutions magik-tools - 0.5.2 + 0.5.3-SNAPSHOT magik-typed-checks diff --git a/pom.xml b/pom.xml index c5226f1c..d8556593 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 nl.ramsolutions magik-tools - 0.5.2 + 0.5.3-SNAPSHOT pom Magik Tools diff --git a/sonar-magik-plugin/pom.xml b/sonar-magik-plugin/pom.xml index 1012c934..ce76e5ff 100644 --- a/sonar-magik-plugin/pom.xml +++ b/sonar-magik-plugin/pom.xml @@ -5,7 +5,7 @@ nl.ramsolutions magik-tools - 0.5.2 + 0.5.3-SNAPSHOT sonar-magik-plugin diff --git a/sslr-magik-toolkit/pom.xml b/sslr-magik-toolkit/pom.xml index 9e86e381..fb4d1146 100644 --- a/sslr-magik-toolkit/pom.xml +++ b/sslr-magik-toolkit/pom.xml @@ -5,7 +5,7 @@ nl.ramsolutions magik-tools - 0.5.2 + 0.5.3-SNAPSHOT sslr-magik-toolkit