Merge pull request #1015 from quantified-uncertainty/factor-vscode-lint-to-prettier

rm eslint

.github/workflows/ci.yml

@@ -182,10 +182,11 @@ jobs:
         working-directory: packages/vscode-ext
     steps:
       - uses: actions/checkout@v3
-      - name: Install dependencies from monorepo level
+      - name: Check javascript, typescript, and markdown lint
-        run: cd ../../ && yarn
+        uses: creyD/prettier_action@v4.2
-      - name: Lint the VSCode Extension source code
+        with:
-        run: yarn lint
+          dry: true
+          prettier_options: --check packages/vscode-ext
 
   vscode-ext-build:
     name: VS Code extension build

.gitignore

@@ -7,3 +7,4 @@ yarn-error.log
 **/.sync.ffs_db
 .direnv
 .log
+result

.prettierignore

@@ -1,15 +1,15 @@
 .direnv
 *.bs.js
 *.gen.tsx
-packages/*/dist
 packages/components/storybook-static
 node_modules
 packages/*/node_modules
 packages/website/.docusaurus
 packages/squiggle-lang/lib
-packages/squiggle-lang/.nyc_output/
 packages/squiggle-lang/coverage/
 packages/squiggle-lang/.cache/
 packages/website/build/
 packages/squiggle-lang/src/rescript/Reducer/Reducer_Peggy/Reducer_Peggy_GeneratedParser.js
 packages/vscode-ext/media/vendor/
+packages/squiggle-lang/.nyc_output/
+packages/*/dist

nixos.sh

@@ -5,14 +5,14 @@
 # We need to patchelf rescript executables. https://github.com/NixOS/nixpkgs/issues/107375
 set -x
 
-fhsShellName="squiggle-development"
+fhsShellName="squiggle-fhs-development"
-fhsShellDotNix="{pkgs ? import <nixpkgs> {} }: (pkgs.buildFHSUserEnv { name = \"${fhsShellName}\"; targetPkgs = pkgs: [pkgs.yarn]; runScript = \"yarn\"; }).env"
+fhsShellDotNix="{pkgs ? import <nixpkgs> {} }: (pkgs.buildFHSUserEnv { name = \"${fhsShellName}\"; targetPkgs = pkgs: [pkgs.yarn pkgs.glibc]; runScript = \"yarn\"; }).env"
 nix-shell - <<<"$fhsShellDotNix"
 
 theLd=$(patchelf --print-interpreter $(which mkdir))
 patchelf --set-interpreter $theLd ./node_modules/gentype/gentype.exe
 patchelf --set-interpreter $theLd ./node_modules/rescript/linux/*.exe
 patchelf --set-interpreter $theLd ./node_modules/bisect_ppx/ppx
-patchelf --set-interpreter $theLd ./node_moduels/bisect_ppx/bisect-ppx-report
+patchelf --set-interpreter $theLd ./node_modules/bisect_ppx/bisect-ppx-report
 theSo=$(find /nix/store/*$fhsShellName*/lib64 -name libstdc++.so.6 | grep $fhsShellName | head -n 1)
 patchelf --replace-needed libstdc++.so.6 $theSo ./node_modules/rescript/linux/ninja.exe

packages/vscode-ext/.eslintrc.json

@@ -1,18 +0,0 @@
-{
-  "root": true,
-  "parser": "@typescript-eslint/parser",
-  "parserOptions": {
-    "ecmaVersion": 6,
-    "sourceType": "module"
-  },
-  "plugins": ["@typescript-eslint"],
-  "rules": {
-    "@typescript-eslint/naming-convention": "warn",
-    "@typescript-eslint/semi": "warn",
-    "curly": "warn",
-    "eqeqeq": "warn",
-    "no-throw-literal": "warn",
-    "semi": "off"
-  },
-  "ignorePatterns": ["out", "dist", "**/*.d.ts"]
-}

packages/vscode-ext/.prettierignore

@@ -0,0 +1,3 @@
+out
+dist
+media/vendor

packages/vscode-ext/package.json

@@ -121,17 +121,14 @@
     "compile": "yarn run compile:vendor && yarn run compile:grammar && yarn run compile:tsc",
     "watch": "tsc -b -watch",
     "pretest": "yarn run compile && yarn run lint",
-    "lint": "eslint client/src server/src --ext ts",
+    "lint": "prettier --check .",
-    "format": "eslint client/src server/src --ext ts --fix",
+    "format": "prettier --write .",
     "package": "npx vsce package --yarn"
   },
   "devDependencies": {
     "@types/glob": "^7.2.0",
     "@types/node": "18.x",
     "@types/vscode": "^1.70.0",
-    "@typescript-eslint/eslint-plugin": "^5.35.1",
-    "@typescript-eslint/parser": "^5.35.1",
-    "eslint": "^8.23.0",
     "glob": "^8.0.3",
     "js-yaml": "^4.1.0",
     "typescript": "^4.8.2",
@@ -143,4 +140,4 @@
     "vscode-languageserver-textdocument": "^1.0.5",
     "@quri/squiggle-lang": "^0.2.11"
   }
-}
+}