Merge pull request #53 from anweiss/lsp

VSCode extension fixes and cleanup

Cargo.toml

@@ -5,7 +5,7 @@ repository = "https://github.com/anweiss/cddl"
 homepage = "https://cddl.anweiss.tech"
 categories = ["parser-implementations", "encoding", "development-tools", "wasm"]
 license = "MIT"
-version = "0.7.1"
+version = "0.7.2"
 authors = ["Andrew Weiss <[email protected]>"]
 readme = "README.md"
 edition = "2018"

cddl-lsp/.vscode/launch.json

@@ -8,10 +8,10 @@
       "name": "Launch Client",
       "runtimeExecutable": "${execPath}",
       "args": ["--extensionDevelopmentPath=${workspaceRoot}"],
-      "outFiles": ["${workspaceRoot}/client/out/**/*.js"],
+      "outFiles": ["${workspaceRoot}/dist/*.js"],
       "preLaunchTask": {
         "type": "npm",
-        "script": "watch"
+        "script": "webpack"
       }
     },
     {
@@ -20,7 +20,7 @@
       "name": "Attach to Server",
       "port": 6009,
       "restart": true,
-      "outFiles": ["${workspaceRoot}/server/out/**/*.js"]
+      "outFiles": ["${workspaceRoot}/dist/*.js"]
     },
     {
       "name": "Language Server E2E Test",
@@ -32,7 +32,8 @@
         "--extensionTestsPath=${workspaceRoot}/client/out/test/index",
         "${workspaceRoot}/client/testFixture"
       ],
-      "outFiles": ["${workspaceRoot}/client/out/test/**/*.js"]
+      "outFiles": ["${workspaceRoot}/client/out/test/**/*.js"],
+      "preLaunchTask": "npm: test-compile"
     }
   ],
   "compounds": [

cddl-lsp/.vscode/tasks.json

@@ -1,33 +1,29 @@
 {
-	"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"
-			]
-		}
-	]
-}
+  "version": "2.0.0",
+  "tasks": [
+    {
+      "type": "npm",
+      "script": "webpack",
+      "group": "build",
+      "presentation": {
+        "panel": "dedicated",
+        "reveal": "never"
+      },
+      "problemMatcher": ["$ts-webpack"]
+    },
+    {
+      "type": "npm",
+      "script": "webpack-dev",
+      "isBackground": true,
+      "group": {
+        "kind": "build",
+        "isDefault": true
+      },
+      "presentation": {
+        "panel": "dedicated",
+        "reveal": "never"
+      },
+      "problemMatcher": ["$ts-webpack-watch"]
+    }
+  ]
+}

cddl-lsp/.vscodeignore

@@ -0,0 +1,12 @@
+**/*.ts
+server/cddl-ls-pkg/
+server/out/
+client/out/
+client/testFixture
+scripts/
+.vscode-test/
+.vscode/
+node_modules/
+
+tsconfig.json
+webpack.config.js

cddl-lsp/README.md

@@ -1,5 +1,7 @@
 # CDDL Language Server Extension
 
+[![](http://vsmarketplacebadge.apphb.com/version/anweiss.cddl-languageserver.svg)](https://marketplace.visualstudio.com/items?itemName=anweiss.cddl-languageserver) [![Build and Test](https://github.com/anweiss/cddl/workflows/Build%20and%20Test/badge.svg)](https://github.com/anweiss/cddl/actions?query=workflow%3A%22Build+and+Test%22)
+
 > This extension is a Preview. Report bugs and issues at https://github.com/anweiss/cddl/issues.
 
 Language server implementation and Visual Studio Code Extension for the Concise Data Definition Language (CDDL). This extension supports the following features:
@@ -11,3 +13,4 @@ Language server implementation and Visual Studio Code Extension for the Concise
   - Group and type rule identifiers
 - Go-to definition
 - Basic diagnostics
+- Formatting

cddl-lsp/client/package.json

@@ -3,7 +3,7 @@
   "description": "VSCode client for the Concise Data Definition Language (CDDL) language server implementation",
   "author": "Andrew Weiss <[email protected]>",
   "license": "MIT",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "publisher": "vscode",
   "repository": {
     "type": "git",