WIP: Updated file paths to built server executable

Author: fwcd

.vscode/tasks.json

@@ -15,7 +15,7 @@
         {
             "label": "Build with Gradle",
             "type": "shell",
-            "command": "gradle installDist",
+            "command": "gradle server:installDist",
             "problemMatcher": [],
             "group": {
                 "kind": "build",

.vscodeignore

@@ -19,7 +19,7 @@ out/test/**
 out/**/*.map
 bin/**
 build/**
-!build/install/**
+!server/build/install/**
 
 tsconfig.json
 tslint.json

BUILDING.md

@@ -24,7 +24,7 @@ Describes how to build and run this project. Note that you might need to use `gr
 | Building | `./gradlew server:build` | Builds, tests and packages the language server |
 
 ### Launching the packaged language server
-* Start scripts for the language server are located under `build/install/KotlinLanguageServer/bin/`
+* Start scripts for the language server are located under `server/build/install/server/bin/`
 
 ### Debugging
 * Attach the running language server on `localhost:8000`

package.json

@@ -22,7 +22,7 @@
     ],
     "main": "./out/extension",
     "files": [
-        "build/install/**"
+        "server/build/install/**"
     ],
     "contributes": {
         "languages": [
@@ -67,7 +67,7 @@
         }
     },
     "scripts": {
-        "package-with-lsp": "gradle installDist && vsce package -o build.vsix",
+        "package-with-lsp": "gradle server:installDist && vsce package -o build.vsix",
         "vscode:prepublish": "npm run compile",
         "compile": "tsc -p ./",
         "watch": "tsc -watch -p ./",

server/build.gradle

@@ -19,7 +19,7 @@ task fixFilePermissions(type: Exec) {
     // When running on macOS or Linux the start script
     // needs executable permissions to run.
     onlyIf { !System.getProperty("os.name").toLowerCase().contains("windows") }
-    commandLine 'chmod', '+x', "${project.buildDir}/install/KotlinLanguageServer/bin/KotlinLanguageServer"
+    commandLine 'chmod', '+x', "${project.buildDir}/install/server/bin/server"
 }
 
 task debugRun(type: JavaExec) {

vscode-extension-src/extension.ts

@@ -49,7 +49,7 @@ export async function activate(context: vscode.ExtensionContext): Promise<void>
         outputChannelName: 'Kotlin',
         revealOutputChannelOn: 4 // never
     }
-    let startScriptPath = path.resolve(context.extensionPath, "server", "build", "install", "KotlinLanguageServer", "bin", correctScriptName("KotlinLanguageServer"))
+    let startScriptPath = path.resolve(context.extensionPath, "server", "build", "install", "server", "bin", correctScriptName("server"))
     let args = [];
 
     // Ensure that start script can be executed