Merge branch 'quarto-dev:main' into feat/protect-options-formatting

Author: mcanouil

.git-blame-ignore-revs

@@ -0,0 +1,8 @@
+# This file lists revisions of large-scale formatting/style changes so that
+# they can be excluded from git blame results.
+#
+# To set this file as the default ignore file for git blame, run:
+#   $ git config blame.ignoreRevsFile .git-blame-ignore-revs
+
+# Format vscode extention and LSP files consistently (#748)
+a1513effc913e6e59651256d79295da37134dbbf

.github/workflows/ci.yaml renamed to .github/workflows/build.yaml

@@ -6,11 +6,13 @@ on:
     branches:
       - main
     paths:
+      - 'apps/lsp/**'
       - 'apps/vscode/**'
   pull_request:
     branches:
       - main
     paths:
+      - 'apps/lsp/**'
       - 'apps/vscode/**'
   workflow_dispatch:
 

.github/workflows/test.yaml

@@ -0,0 +1,38 @@
+
+name: Test VS Code Extension
+
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+    branches:
+      - main
+  workflow_dispatch:
+
+jobs:
+  test-extension:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: actions/setup-node@v4
+        with:
+          node-version: latest
+
+      - name: Update build environment and install XVFB
+        run: |
+          sudo apt-get -y update
+          sudo apt-get -y install --fix-missing xvfb
+
+      - uses: quarto-dev/quarto-actions/setup@v2
+
+      - name: Build vscode extension
+        run: |
+          yarn install
+          yarn run build-vscode
+
+      - name: Compile and run tests
+        run: |
+          yarn install --immutable --immutable-cache --check-cache
+          xvfb-run yarn test-vscode

.gitignore

@@ -15,3 +15,5 @@ public/dist
 .luarc.json
 .ipynb_checkpoints
 /.luarc.json
+.vscode-test
+*.vsix

.vscode/launch.json

@@ -5,7 +5,6 @@
 {
 	"version": "0.2.0",
 	"configurations": [
-    
 		{
 			"name": "Run VS Code Extension",
 			"type": "extensionHost",
@@ -23,7 +22,9 @@
       "name": "Attach to VS Code LSP Server",
       "port": 6009,
       "restart": true,
-      "outFiles": ["${workspaceRoot}/out/**/*.js"]
-    },
-	]
+      "outFiles": [
+        "${workspaceFolder}/apps/vscode/out/lsp/**/*.js"
+      ]
+    }
+  ]
 }

.vscode/settings.json

@@ -4,8 +4,12 @@
         "editor.formatOnSave": true
     },
     "typescript.tsdk": "node_modules/typescript/lib",
+    "editor.detectIndentation": false,
     "editor.tabSize": 2,
+    "editor.insertSpaces": true,
     "files.insertFinalNewline": true,
     "files.trimFinalNewlines": true,
-    "files.trimTrailingWhitespace": true
+    "files.trimTrailingWhitespace": true,
+    "javascript.format.semicolons": "insert",
+    "typescript.format.semicolons": "insert"
 }

.zed/settings.json

@@ -0,0 +1,12 @@
+{
+  "languages": {
+    "TypeScript": {
+      "tab_size": 2,
+      "hard_tabs": false,
+      "ensure_final_newline_on_save": true,
+      "remove_trailing_whitespace_on_save": true,
+      "format_on_save": "on",
+      "formatter": "language_server"
+    }
+  }
+}

README.md

@@ -13,6 +13,8 @@ Here is where you can find the source code for various parts of the Quarto syste
 
 ## Development
 
+### VS Code Extension
+
 To develop the Quarto VS Code extension, clone this repo, run `yarn`, then run the `yarn dev-vscode` command:
 
 ```bash
@@ -22,5 +24,4 @@ yarn dev-vscode  # run development/debug version of extension
 
 Use the VS Code **Run and Debug** pane in the activity bar to run a version of VS Code with the development build of the extension.
 
-
-
+See our [`CONTRIBUTING`](https://github.com/quarto-dev/quarto/blob/main/apps/vscode/CONTRIBUTING.md) file for more information

apps/lsp/.eslintrc.js

@@ -1,4 +1,7 @@
 module.exports = {
   root: true,
   extends: ["custom-server"],
+  rules: {
+    '@typescript-eslint/no-unused-vars': ['error', { argsIgnorePattern: '^_' }],
+  },
 };

apps/lsp/build.ts

@@ -23,13 +23,13 @@ const nodeSqlLiteWasm = '../../node_modules/node-sqlite3-wasm/dist/*.wasm';
 
 runBuild({
   entryPoints: ['./src/index.ts'],
-  outfile: './dist/lsp.js',
+  outfile: '../vscode/out/lsp/lsp.js',
   assets: [
-    { from: [nodeSqlLiteWasm], to: './dist/' },
-    { from: ['./src/run.js'], to: './dist' },
-    { from: ['../../packages/editor-server/src/resources/**'], to: './dist/resources/' },
-    { from: ['../../packages/quarto-core/src/resources/**'], to: './dist/resources/' },
-    { from: ['./dist/**'], to: ['../vscode/out/lsp/'] }],
+    { from: [nodeSqlLiteWasm], to: '../vscode/out/lsp/' },
+    { from: ['./src/run.js'], to: '../vscode/out/lsp' },
+    { from: ['../../packages/editor-server/src/resources/**'], to: '../vscode/out/lsp/resources/' },
+    { from: ['../../packages/quarto-core/src/resources/**'], to: '../vscode/out/lsp/resources/' }
+  ],
   minify: !dev,
   dev
 })