Merge pull request #1 from neuroevolutus/import-tree-sitter

Fix most of the tests

Author: surprisetalk

.github/workflows/ci.yml

@@ -31,11 +31,10 @@ jobs:
 
       - name: Lint
         run: npm run lint
-        if: ${{ false }} # Disable linting for now
+        if: ${{ ! startsWith(matrix.node-version, '16.') }}
 
       - name: Test
-        run: npm test
-        if: ${{ false }} # Disable testing for now
+        run: npm run --workspace server test
 
   package:
     runs-on: ubuntu-latest

.vscode/launch.json

@@ -0,0 +1,24 @@
+{
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "type": "extensionHost",
+      "request": "launch",
+      "name": "Launch Extension",
+      "runtimeExecutable": "${execPath}",
+      "args": [
+          "--extensionDevelopmentPath=${workspaceFolder}",
+          "${workspaceFolder}"
+      ],
+      "outFiles": [
+          "${workspaceFolder}/client/out/**/*.js",
+          "${workspaceFolder}/server/out/**/*.js",
+      ],
+      "autoAttachChildProcesses": true,
+      "preLaunchTask": {
+        "type": "npm",
+        "script": "watch"
+      }
+    }
+  ]
+}

.vscode/tasks.json

@@ -0,0 +1,18 @@
+{
+	"version": "2.0.0",
+	"tasks": [
+		{
+			"type": "npm",
+			"script": "watch",
+			"problemMatcher": "$tsc-watch",
+			"isBackground": true,
+			"presentation": {
+				"reveal": "never"
+			},
+			"group": {
+				"kind": "build",
+				"isDefault": true
+			}
+		}
+	]
+}

client/tsconfig.json

@@ -1,4 +1,5 @@
 {
+  "extends": "../tsconfig.json",
   "compilerOptions": {
     "module": "commonjs",
     "target": "es2020",

eslint.config.mjs

@@ -0,0 +1,13 @@
+import js from "@eslint/js";
+import globals from "globals";
+import tseslint from "typescript-eslint";
+import { defineConfig } from "eslint/config";
+
+
+export default defineConfig([
+  { ignores: ["**/*.{js,mjs,cjs}"] },
+  { files: ["**/*.{js,mjs,cjs,ts,mts,cts}"], plugins: { js }, extends: ["js/recommended"] },
+  { files: ["**/*.js"], languageOptions: { sourceType: "commonjs" } },
+  { files: ["**/*.{js,mjs,cjs,ts,mts,cts}"], languageOptions: { globals: globals.node } },
+  tseslint.configs.recommended,
+]);

language-configuration.json

@@ -1,5 +1,4 @@
 {
-  "title": "scrapscript",
   "comments": {
     "lineComment": "--"
   },
@@ -23,23 +22,6 @@
   "indentationRules": {
     "increaseIndentPattern": "({[\\s]*|\\([\\s]*)$",
     "decreaseIndentPattern": "^[\\s]*[)}]"
-  },
-  "properties": {
-    "scrapscript.maxNumberOfProblems": {
-      "type": "number",
-      "default": 1000,
-      "description": "Maximum number of problems to report"
-    },
-    "scrapscript.enableEnhancedFeatures": {
-      "type": "boolean",
-      "default": true,
-      "description": "Enable enhanced language features"
-    },
-    "scrapscript.enableTypeChecking": {
-      "type": "boolean",
-      "default": true,
-      "description": "Enable type checking"
-    }
   }
 }