restructured ls

.eslintrc.json

@@ -0,0 +1,15 @@
+{
+  "root": true,
+  "parser": "@typescript-eslint/parser",
+  "parserOptions": {
+      "ecmaVersion": 12,
+      "sourceType": "module"
+  },
+  "plugins": ["@typescript-eslint"],
+  "extends": ["eslint:recommended", "plugin:@typescript-eslint/recommended"],
+  "rules": {
+      "@typescript-eslint/no-explicit-any": "off",
+      "@typescript-eslint/ban-ts-comment": "off"
+  },
+  "ignorePatterns": ["**/*.d.ts", "lib", "dist", "webpack.config.js"]
+}

language-server/langium-config.json → extension/langium-config.json

@@ -2,11 +2,11 @@
     "projectName": "Stpa",
     "languages": [{
         "id": "stpa",
-        "grammar": "src/stpa.langium",
+        "grammar": "src-language-server/stpa.langium",
         "fileExtensions": [".stpa"],
         "textMate": {
-            "out": "../extension/syntaxes/stpa.tmLanguage.json"
+            "out": "syntaxes/stpa.tmLanguage.json"
         }
     }],
-    "out": "src/generated"
+    "out": "src-language-server/generated"
 }

extension/package.json

@@ -162,6 +162,9 @@
     "main": "./pack/extension",
 
     "dependencies": {
+        "langium-sprotty": "0.3.0-next.5e9d27d",
+        "sprotty-elk": "^0.11.0",
+        "vscode-languageserver": "^7.0.0",
         "reflect-metadata": "^0.1.13",
         "feather-icons": "^4.28.0",
         "sprotty": "~0.11.1",
@@ -170,25 +173,29 @@
     "devDependencies": {
         "@types/node": "^12.12.6",
         "@types/vscode": "1.46.0",
+        "@types/feather-icons": "^4.7.0",
         "rimraf": "^3.0.2",
         "source-map-loader": "^3.0.0",
         "sprotty-vscode": "^0.2.0",
-        "stpa-language-server": "^0.0.0",
         "ts-loader": "^9.2.6",
         "typescript": "3.8.3",
         "vscode-languageclient": "^7.0.0",
         "webpack": "^5.64.2",
         "webpack-cli": "^4.9.1",
-        "@types/feather-icons": "^4.7.0",
         "css-loader": "^6.5.1",
         "file-loader": "^6.2.0",
+        "langium-cli": "0.3.0-next.5e9d27d",
         "style-loader": "^1.2.1"
     },
     "scripts": {
-        "prepare": "yarn run clean && yarn run build && yarn run copy-language-server",
+        "prepare": "yarn run clean && yarn run langium:generate && yarn run build",
         "clean": "rimraf pack",
-        "build": "webpack --mode=development",
-        "watch": "webpack --mode=development --watch",
-        "copy-language-server": "copy ..\\language-server\\out\\* pack"
+        "langium:generate": "langium generate",
+        "langium:watch": "langium generate --watch",
+        "lint": "eslint .",
+        "build": "yarn run langium:generate && webpack --mode production",
+        "watch": "yarn run langium:watch && webpack --watch",
+        "package": "yarn run langium:generate && vsce package --yarn -o keith-vscode.vsix",
+        "vscode:prepublish": "yarn run build"
     }
 }