From 219b2486397664a00321ea8ff19a63fcd419fb83 Mon Sep 17 00:00:00 2001 From: Steven Looman Date: Thu, 2 May 2024 22:16:16 +0200 Subject: [PATCH] Work from single VSCode instance --- .vscode/launch.json | 119 ++++++++++-------- .vscode/settings.json | 56 +++++---- .vscode/tasks.json | 119 +++++++----------- .../client-vscode/.vscode/launch.json | 32 ----- .../client-vscode/.vscode/settings.json | 10 -- .../client-vscode/.vscode/tasks.json | 33 ----- 6 files changed, 142 insertions(+), 227 deletions(-) delete mode 100644 magik-language-server/client-vscode/.vscode/launch.json delete mode 100644 magik-language-server/client-vscode/.vscode/settings.json delete mode 100644 magik-language-server/client-vscode/.vscode/tasks.json diff --git a/.vscode/launch.json b/.vscode/launch.json index ed101f39..3a2e1f47 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -1,56 +1,67 @@ { - // Use IntelliSense to learn about possible attributes. - // Hover to view descriptions of existing attributes. - // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387 - "version": "0.2.0", - "configurations": [ - { - "type": "java", - "name": "Debug (Launch) - Current File", - "request": "launch", - "mainClass": "${file}" - }, - { - "type": "java", - "name": "Debug (Launch)-MagikLint", - "request": "launch", - "mainClass": "nl.ramsolutions.sw.magik.lint.Main", - "projectName": "magik-lint", - "args": [ - "--debug", - "magik-lint/lint-demo.magik" - ] - }, - { - "type": "java", - "name": "Debug (Launch)-MagikToolkit", - "request": "launch", - "mainClass": "nl.ramsolutions.sw.magik.toolkit.MagikToolkit", - "projectName": "sslr-magik-toolkit" - }, - { - "type": "java", - "name": "Debug (Attach)-LanguageServer", - "request": "attach", - "hostName": "localhost", - "port": 5005, - "projectName": "magik-language-server" - }, - { - "type": "java", - "name": "Debug (Attach)-DebugAdapter", - "request": "attach", - "hostName": "localhost", - "port": 5006, - "projectName": "magik-debug-adapter" - }, - { - "type": "java", - "name": "Debug (Attach)-sonar-magik-plugin", - "request": "attach", - "hostName": "localhost", - "port": 5007, - "projectName": "sonar-magik-plugin" - } - ] + // Use IntelliSense to learn about possible attributes. + // Hover to view descriptions of existing attributes. + // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387 + "version": "0.2.0", + "configurations": [ + { + "type": "java", + "name": "Debug (Launch)-MagikLint", + "request": "launch", + "mainClass": "nl.ramsolutions.sw.magik.lint.Main", + "projectName": "magik-lint", + "args": [ + "--debug", + "magik-lint/lint-demo.magik" + ] + }, + { + "type": "java", + "name": "Debug (Launch)-MagikToolkit", + "request": "launch", + "mainClass": "nl.ramsolutions.sw.magik.toolkit.MagikToolkit", + "projectName": "sslr-magik-toolkit" + }, + { + "type": "java", + "name": "Debug (Attach)-LanguageServer", + "request": "attach", + "hostName": "localhost", + "port": 5005, + "projectName": "magik-language-server" + }, + { + "type": "java", + "name": "Debug (Attach)-DebugAdapter", + "request": "attach", + "hostName": "localhost", + "port": 5006, + "projectName": "magik-debug-adapter" + }, + { + "type": "java", + "name": "Debug (Attach)-sonar-magik-plugin", + "request": "attach", + "hostName": "localhost", + "port": 5007, + "projectName": "sonar-magik-plugin" + }, + { + "type": "extensionHost", + "request": "launch", + "name": "Launch VSCode Extension", + "runtimeExecutable": "${execPath}", + "args": [ + "--extensionDevelopmentPath=${workspaceRoot}/magik-language-server/client-vscode" + ], + "outFiles": [ + "${workspaceRoot}/magik-language-server/client-vscode/client/out/**/*.js" + ], + "preLaunchTask": { + "type": "npm", + "script": "watch", + "path": "magik-language-server/client-vscode", + } + } + ], } \ No newline at end of file diff --git a/.vscode/settings.json b/.vscode/settings.json index 7ef7637a..de5048fe 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,27 +1,33 @@ { - "editor.detectIndentation": false, - "editor.renderWhitespace": "selection", - "editor.rulers": [100, 120], - "editor.tabSize": 4, - "files.exclude": { - "**/.classpath": true, - "**/.project": true, - "**/.settings": true, - "**/.factorypath": true - }, - "files.trimFinalNewlines": true, - "files.trimTrailingWhitespace": true, - "java.autobuild.enabled": false, - "java.checkstyle.version": "10.15.0", - "java.checkstyle.configuration": "/google_checks.xml", - "java.compile.nullAnalysis.mode": "automatic", - "java.configuration.maven.notCoveredPluginExecutionSeverity": "ignore", - "java.configuration.updateBuildConfiguration": "automatic", - "java.debug.settings.showLogicalStructure": true, - "java.jdt.ls.vmargs": "-XX:+UseParallelGC -XX:GCTimeRatio=4 -XX:AdaptiveSizePolicyWeight=90 -Dsun.zip.disableMemoryMapping=true -Xmx2G -Xms100m -Xlog:disable", - "sonarlint.connectedMode.project": { - "connectionId": "SonarCloud", - "projectKey": "StevenLooman_magik-tools" - }, - "java.debug.settings.onBuildFailureProceed": true, + "editor.detectIndentation": false, + "editor.renderWhitespace": "selection", + "editor.rulers": [ + 100, + 120 + ], + "editor.tabSize": 4, + "files.exclude": { + "**/.classpath": true, + "**/.project": true, + "**/.settings": true, + "**/.factorypath": true + }, + "files.trimFinalNewlines": true, + "files.trimTrailingWhitespace": true, + "java.autobuild.enabled": false, + "java.checkstyle.configuration": "/google_checks.xml", + "java.checkstyle.version": "10.15.0", + "java.compile.nullAnalysis.mode": "automatic", + "java.configuration.maven.notCoveredPluginExecutionSeverity": "ignore", + "java.configuration.updateBuildConfiguration": "automatic", + "java.debug.settings.onBuildFailureProceed": true, + "java.debug.settings.showLogicalStructure": true, + "java.jdt.ls.vmargs": "-XX:+UseParallelGC -XX:GCTimeRatio=4 -XX:AdaptiveSizePolicyWeight=90 -Dsun.zip.disableMemoryMapping=true -Xmx2G -Xms100m -Xlog:disable", + "sonarlint.connectedMode.project": { + "connectionId": "SonarCloud", + "projectKey": "StevenLooman_magik-tools" + }, + "tslint.enable": true, + "typescript.tsc.autoDetect": "off", + "typescript.preferences.quoteStyle": "single", } \ No newline at end of file diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 1fe18d33..291ae12d 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -1,75 +1,48 @@ { - // See https://go.microsoft.com/fwlink/?LinkId=733558 - // for the documentation about the tasks.json format - "version": "2.0.0", - "tasks": [ - { - "label": "verify", - "type": "shell", - "command": "mvn verify", - "group": "build", - "problemMatcher": [] - }, - { - "label": "clean", - "type": "shell", - "command": "mvn clean", - "group": "build", - "problemMatcher": [] - }, - { - "label": "clean test", - "type": "shell", - "command": "mvn clean test", - "group": "test", - "problemMatcher": [] - }, - { - "label": "clean package", - "type": "shell", - "command": "mvn clean package", - "group": "build", - "problemMatcher": [] - }, - { - "label": "clean package magik-lint", - "type": "shell", - "command": "mvn clean package -pl magik-lint -am -DskipTests=true", - "group": { - "kind": "build", - "isDefault": true - }, - "problemMatcher": [] - }, - { - "label": "clean package magik-language-server", - "type": "shell", - "command": "mvn clean package -pl magik-language-server -am -DskipTests=true", - "group": { - "kind": "build", - "isDefault": true - }, - "problemMatcher": [] - }, - { - "label": "clean package magik-debug-adapter", - "type": "shell", - "command": "mvn clean package -pl magik-debug-adapter -am -DskipTests=true", - "group": { - "kind": "build", - "isDefault": true - }, - "problemMatcher": [] - }, - { - "label": "clean package sslr-magik-toolkit", - "type": "shell", - "command": "mvn clean package -pl sslr-magik-toolkit -am -DskipTests=true", - "group": { - "kind": "build", - "isDefault": true - }, - "problemMatcher": [] - } - ] + // See https://go.microsoft.com/fwlink/?LinkId=733558 + // for the documentation about the tasks.json format + "version": "2.0.0", + "tasks": [ + { + "label": "mvn clean spotless:apply verify test package", + "type": "shell", + "command": "mvn clean spotless:apply verify test package", + "group": "build", + "problemMatcher": [], + "presentation": { + "panel": "dedicated", + "reveal": "never" + } + }, + { + "type": "npm", + "script": "compile", + "group": "build", + "presentation": { + "panel": "dedicated", + "reveal": "never" + }, + "path": "magik-language-server/client-vscode", + "problemMatcher": [ + "$tsc" + ] + }, + { + "type": "npm", + "script": "watch", + "isBackground": true, + "group": { + "kind": "build", + "isDefault": true + }, + "presentation": { + "panel": "dedicated", + "reveal": "never" + }, + "path": "magik-language-server/client-vscode", + "problemMatcher": [ + "$tsc-watch" + ] + } + ] } \ No newline at end of file diff --git a/magik-language-server/client-vscode/.vscode/launch.json b/magik-language-server/client-vscode/.vscode/launch.json deleted file mode 100644 index c049832c..00000000 --- a/magik-language-server/client-vscode/.vscode/launch.json +++ /dev/null @@ -1,32 +0,0 @@ -// A launch configuration that compiles the extension and then opens it inside a new window -{ - "version": "0.2.0", - "configurations": [ - { - "type": "extensionHost", - "request": "launch", - "name": "Launch Client", - "runtimeExecutable": "${execPath}", - "args": ["--extensionDevelopmentPath=${workspaceRoot}"], - "outFiles": ["${workspaceRoot}/client/out/**/*.js"], - "preLaunchTask": { - "type": "npm", - "script": "watch" - } - }, - { - "type": "node", - "request": "attach", - "name": "Attach to Server", - "port": 6009, - "restart": true, - "outFiles": ["${workspaceRoot}/server/out/**/*.js"] - } - ], - "compounds": [ - { - "name": "Client + Server", - "configurations": ["Launch Client", "Attach to Server"] - } - ] -} diff --git a/magik-language-server/client-vscode/.vscode/settings.json b/magik-language-server/client-vscode/.vscode/settings.json deleted file mode 100644 index 1a77e024..00000000 --- a/magik-language-server/client-vscode/.vscode/settings.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "editor.insertSpaces": false, - "tslint.enable": true, - "typescript.tsc.autoDetect": "off", - "typescript.preferences.quoteStyle": "single", - "sonarlint.connectedMode.project": { - "connectionId": "SonarCloud", - "projectKey": "StevenLooman_magik-tools" - } -} \ No newline at end of file diff --git a/magik-language-server/client-vscode/.vscode/tasks.json b/magik-language-server/client-vscode/.vscode/tasks.json deleted file mode 100644 index 070d88eb..00000000 --- a/magik-language-server/client-vscode/.vscode/tasks.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "version": "2.0.0", - "tasks": [ - { - "type": "npm", - "script": "compile", - "group": "build", - "presentation": { - "panel": "dedicated", - "reveal": "never" - }, - "problemMatcher": [ - "$tsc" - ] - }, - { - "type": "npm", - "script": "watch", - "isBackground": true, - "group": { - "kind": "build", - "isDefault": true - }, - "presentation": { - "panel": "dedicated", - "reveal": "never" - }, - "problemMatcher": [ - "$tsc-watch" - ] - } - ] -} \ No newline at end of file