Merge branch 'main' into pr2671

opral · Apr 30, 2024 · 7962c21 · 7962c21
2 parents 60b9572 + 1f6fda6
commit 7962c21
Show file tree

Hide file tree

Showing 18 changed files with 41,803 additions and 36,954 deletions.
diff --git a/.changeset/small-mayflies-care.md b/.changeset/small-mayflies-care.md
@@ -0,0 +1,5 @@
+---
+"vs-code-extension": minor
+---
+
+add ability to disable inline annotations
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -25,7 +25,7 @@ jobs:
       - name: Setup Pnpm
         uses: pnpm/action-setup@v2
         with:
-          version: 8
+          version: 9
 
       - name: Install node
         uses: actions/setup-node@v3

diff --git a/.github/workflows/ide-extension-e2e-test.yml b/.github/workflows/ide-extension-e2e-test.yml
@@ -20,7 +20,7 @@ jobs:
       - name: Setup Pnpm
         uses: pnpm/action-setup@v2
         with:
-          version: 8
+          version: 9
 
       - name: Install node
         uses: actions/setup-node@v4

diff --git a/.github/workflows/publish-github-lint-action.yml b/.github/workflows/publish-github-lint-action.yml
@@ -21,7 +21,7 @@ jobs:
       - name: Setup Pnpm
         uses: pnpm/action-setup@v2
         with:
-          version: 8
+          version: 9
 
       - name: Setup Node
         uses: actions/setup-node@v4

diff --git a/.github/workflows/publish-ide-extension.yml b/.github/workflows/publish-ide-extension.yml
@@ -22,7 +22,7 @@ jobs:
       - name: Setup Pnpm
         uses: pnpm/action-setup@v2
         with:
-          version: 8
+          version: 9
 
 
       - name: Setup Node

diff --git a/.github/workflows/publish-npm-packages.yml b/.github/workflows/publish-npm-packages.yml
@@ -23,7 +23,7 @@ jobs:
       - name: Setup Pnpm
         uses: pnpm/action-setup@v2
         with:
-          version: 8
+          version: 9
 
       - uses: actions/setup-node@v3
         with:

diff --git a/.github/workflows/sync-examples.yml b/.github/workflows/sync-examples.yml
@@ -57,7 +57,7 @@ jobs:
       - name: Setup Pnpm
         uses: pnpm/action-setup@v2
         with:
-          version: 8
+          version: 9
 
       - name: Install node
         uses: actions/setup-node@v3

diff --git a/.github/workflows/versioning.yml b/.github/workflows/versioning.yml
@@ -26,7 +26,7 @@ jobs:
       - name: Setup Pnpm
         uses: pnpm/action-setup@v2
         with:
-          version: 8
+          version: 9
 
       - name: Setup Node.js 18
         uses: actions/setup-node@v3

diff --git a/inlang/source-code/github-lint-action/internal-testing/index.cjs b/inlang/source-code/github-lint-action/internal-testing/index.cjs
diff --git a/inlang/source-code/ide-extension/README.md b/inlang/source-code/ide-extension/README.md
@@ -179,6 +179,16 @@ If you want to add lint rules to your experience, you can add them from https://
 - VS Code version 1.84.0 or higher.
 - Node.js version v18 or higher.
 
+## Customization
+
+### Disable Inline Annotations
+
+You can disable inline annotations by setting the following property to `false` in your `settings.json` file or by using the command `Sherlock: Toggle Inline Annotations`. The default value is `true`.
+
+```json
+"sherlock.inlineAnnotations.enabled": false
+```
+
 #### Troubleshooting
 
 If you are having trouble with the **loading icon** not disappearing, this is a known issue & we are working with Visual Studio Code to fix it. In the meantime, you can right-click the Inlang icon to hide it: