Update tsconfig and vscode tasks setup

Based on https://github.com/microsoft/vscode-extension-samples/blob/e1ecdaec8974b938e7a92589faa233e1691d251f/lsp-sample/.vscode/launch.json

Author: skovhus

.vscode/launch.json

@@ -1,3 +1,5 @@
+// A launch configuration that compiles the extension and then opens it inside a new window
+// https://github.com/microsoft/vscode-extension-samples/blob/e1ecdaec8974b938e7a92589faa233e1691d251f/lsp-sample/.vscode/launch.json
 {
 "version": "0.2.0",
 "configurations": [
@@ -9,12 +11,39 @@
 "args": [
 "--extensionDevelopmentPath=${workspaceRoot}/vscode-client"
 ],
-"stopOnEntry": false,
-"sourceMaps": true,
 "outFiles": [
 "${workspaceRoot}/vscode-client/out/**/*.js"
 ],
-"preLaunchTask": "compile"
+"preLaunchTask": {
+"type": "npm",
+"script": "watch"
+}
+},
+{
+"type": "node",
+"request": "attach",
+"name": "Attach to Server",
+"port": 6009,
+"restart": true,
+"outFiles": ["${workspaceRoot}/server/out/**/*.js"]
+},
+{
+"name": "Language Server E2E Test",
+"type": "extensionHost",
+"request": "launch",
+"runtimeExecutable": "${execPath}",
+"args": [
+"--extensionDevelopmentPath=${workspaceRoot}",
+"--extensionTestsPath=${workspaceRoot}/vscode-client/out/test/index",
+"${workspaceRoot}/vscode-client/testFixture"
+],
+"outFiles": ["${workspaceRoot}/vscode-client/out/test/**/*.js"]
+}
+],
+"compounds": [
+{
+"name": "Client + Server",
+"configurations": ["Launch Client", "Attach to Server"]
 }
 ]
 }

.vscode/settings.json

@@ -1,6 +1,5 @@
 {
 "files.exclude": {
-"vscode-client/out": true,
 "server/out": true
 },
 "search.exclude": {

.vscode/tasks.json

@@ -2,17 +2,18 @@
 "version": "2.0.0",
 "tasks": [
 {
-"label": "compile",
 "type": "npm",
-"script": "compile",
-"group": "build",
+"script": "watch",
+"problemMatcher": "$tsc-watch",
+"isBackground": true,
 "presentation": {
 "panel": "dedicated",
 "reveal": "never"
 },
-"problemMatcher": [
-"$tsc"
-]
+"group": {
+"kind": "build",
+"isDefault": true
+}
 }
 ]
 }

docs/development-guide.md

@@ -59,8 +59,6 @@ View to launch the `Launch Client` task. This will open a new vscode window with
 extension loaded. It also looks for changes to your client code and recompiles
 it whenever you save your changes.
 
-As the server is embedded into the
-
 ### Atom
 
 See the [ide-bash][ide-bash] package for Atom. Due to how Atom packages are
@@ -77,12 +75,6 @@ yarn link-server
 
 After that follow the steps above to work on the client.
 
-If you make any changes to the server, you need to recompile it:
-
-```
-yarn compile:server
-```
-
 
 ## Working on the server (standalone)
 

package.json

@@ -3,18 +3,17 @@
  "scripts": {
  "clean": "rm -rf *.log */*.log */out node_modules vscode-client/node_modules server/node_modules",
  "postinstall": "cd server && yarn install && cd ../vscode-client && yarn install && cd ..",
- "compile": "yarn run compile:server && yarn run compile:client",
- "compile:client": "cd vscode-client && yarn run compile",
- "compile:server": "cd server && yarn run compile",
+ "compile": "tsc -b",
+ "watch": "tsc -b -w",
  "lint": "yarn lint:bail --fix",
  "lint:bail": "eslint . --ext js,ts,tsx --cache",
  "test": "jest --runInBand",
  "test:coverage": "yarn run test --coverage",
  "test:watch": "yarn run test --watch",
  "verify": "yarn run lint && yarn run compile && yarn run test",
  "verify:bail": "yarn run lint:bail && yarn run compile && yarn run test:coverage",
- "reinstall-server": "npm uninstall -g bash-language-server && yarn compile:server && npm i -g ./server",
- "link-server": "npm uninstall -g bash-language-server && yarn compile:server && yarn unlink bash-language-server && cd server && yarn link && cd ../vscode-client && yarn link bash-language-server"
+ "reinstall-server": "npm uninstall -g bash-language-server && yarn compile && npm i -g ./server",
+ "link-server": "npm uninstall -g bash-language-server && yarn compile && yarn unlink bash-language-server && cd server && yarn link && cd ../vscode-client && yarn link bash-language-server"
  },
  "devDependencies": {
  "@types/jest": "^25.1.3",

server/package.json

@@ -29,9 +29,7 @@
  "web-tree-sitter": "^0.16.2"
  },
  "scripts": {
- "compile": "rm -rf out && ../node_modules/.bin/tsc -p ./",
- "compile:watch": "../node_modules/.bin/tsc -w -p ./",
- "prepublishOnly": "yarn run compile"
+ "prepublishOnly": "cd ../ && yarn run compile"
  },
  "devDependencies": {
  "@types/fuzzy-search": "^2.1.0",

server/tsconfig.json

@@ -1,12 +1,14 @@
 {
- "extends": "../tsconfig.base.json",
+ "extends": "../tsconfig.json",
  "compilerOptions": {
  "outDir": "out",
+ "rootDir": "src",
 
  "lib": [
  "dom", // Required by @types/turndown
  "es2016"
  ],
- "strict": true,
- }
+ },
+ "include": ["src"],
+ "exclude": ["node_modules", "../testing", "src/__tests__"]
 }

tsconfig.eslint.json

@@ -1,5 +1,5 @@
 {
- "extends": "./tsconfig.base.json",
+ "extends": "./tsconfig.json",
  "exclude": [
  "node_modules"
  ],

tsconfig.base.json renamed to tsconfig.json

@@ -10,12 +10,22 @@
  "lib": [
  "es2016"
  ],
+ "rootDir": ".",
  "sourceMap": true
  },
+ "include": [
+ "testing"
+ ],
  "exclude": [
  "node_modules",
  "**/__tests__/*",
+ "vscode-client/out",
+ "server/out",
  "server/setupJest.ts",
  "testing"
+ ],
+ "references": [
+ { "path": "./vscode-client" },
+ { "path": "./server" }
  ]
 }

vscode-client/package.json

@@ -25,7 +25,7 @@
  "activationEvents": [
  "onLanguage:shellscript"
  ],
- "main": "./out/src/extension",
+ "main": "./out/extension",
  "contributes": {
  "configuration": {
  "type": "object",
@@ -50,9 +50,7 @@
  }
  },
  "scripts": {
- "vscode:prepublish": "yarn run compile",
- "compile": "rm -rf out && ../node_modules/.bin/tsc -p ./",
- "compile:watch": "../node_modules/.bin/tsc -w -p ./"
+ "vscode:prepublish": "cd.. && yarn run compile"
  },
  "dependencies": {
  "bash-language-server": "1.13.0",