Merge remote-tracking branch 'upstream/main' into generate-examples

Author: trillium

.editorconfig

@@ -22,7 +22,7 @@ insert_final_newline = false
 # with a line that has trailing white space. Many of our recorded
 # tests use strings with trailing white space to represent the final
 # document contents. For example
-# packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/changeCondition.yml
+# data/fixtures/recorded/languages/ruby/changeCondition.yml
 trim_trailing_whitespace = false
 
 [Makefile]

.github/DISCUSSION_TEMPLATE/architectural-decision-record.yml

@@ -0,0 +1,27 @@
+body:
+  - type: markdown
+    attributes:
+      value: |
+        You are submitting to our Architecture Decision Record.
+        Learn more about ADRs at <https://adr.github.io>, and discussion #1211.
+
+  - type: textarea
+    attributes:
+      label: Context
+      description: The issue motivating this decision, and any context that influences or constrains the decision.
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Options considered
+
+  - type: textarea
+    attributes:
+      label: Decision
+      description: "The change that we're proposing or have agreed to implement."
+
+  - type: textarea
+    attributes:
+      label: Consequences
+      description: What becomes easier or more difficult to do and any risks introduced by the change that will need to be mitigated.

.pre-commit-config.yaml

@@ -39,8 +39,8 @@ repos:
         # with a line that has trailing white space. Many of our recorded
         # tests use strings with trailing white space to represent the final
         # document contents. For example
-        # packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/changeCondition.yml
-        exclude: ^packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/.*/[^/]*\.yml$|\.scope$|/generated/|^patches/
+        # data/fixtures/recorded/languages/ruby/changeCondition.yml
+        exclude: ^data/fixtures/recorded/.*/[^/]*\.yml$|\.scope$|/generated/|^patches/
   - repo: local
     hooks:
       - id: eslint
@@ -61,14 +61,14 @@ repos:
     hooks:
       - id: format-recorded-tests
         name: format-recorded-tests
-        files: ^packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/.*/[^/]*\.yml$
+        files: ^data/fixtures/recorded/.*/[^/]*\.yml$
         language: system
         entry: pnpm exec ./packages/common/scripts/my-ts-node.js packages/cursorless-engine/src/scripts/transformRecordedTests/index.ts
   - repo: local
     hooks:
       - id: check-recorded-test-marks
         name: check-recorded-test-marks
-        files: ^packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/.*/[^/]*\.yml$
+        files: ^data/fixtures/recorded/.*/[^/]*\.yml$
         language: system
         entry: pnpm exec ./packages/common/scripts/my-ts-node.js packages/cursorless-engine/src/scripts/transformRecordedTests/index.ts --check-marks
   - repo: https://github.com/ikamensh/flynt

.prettierignore

@@ -2,7 +2,7 @@
 **/generated
 
 # We use our own format for our recorded yaml tests to keep them compact
-/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/**/*.yml
+/data/fixtures/recorded/**/*.yml
 
 pnpm-lock.yaml