Migrating markdown scopes

data/fixtures/scopes/markdown/section.scope

@@ -0,0 +1,66 @@
+# H1
+
+Sub 1
+
+## H2
+
+Sub 2
+
+# H1.2
+---
+
+[#1 Content] =
+[#1 Domain] = 0:0-6:5
+  >----
+0| # H1
+1|
+2| Sub 1
+3|
+4| ## H2
+5|
+6| Sub 2
+   -----<
+
+[#1 Removal] = 0:0-8:0
+  >----
+0| # H1
+1|
+2| Sub 1
+3|
+4| ## H2
+5|
+6| Sub 2
+7|
+8| # H1.2
+   <
+
+[#1 Insertion delimiter] = "\n\n"
+
+
+[#2 Content] =
+[#2 Domain] = 4:0-6:5
+  >-----
+4| ## H2
+5|
+6| Sub 2
+   -----<
+
+[#2 Removal] = 4:0-8:0
+  >-----
+4| ## H2
+5|
+6| Sub 2
+7|
+8| # H1.2
+   <
+
+[#2 Insertion delimiter] = "\n\n"
+
+
+[#3 Content] =
+[#3 Removal] =
+[#3 Domain] = 8:0-8:6
+  >------<
+8| # H1.2
+
+[#3 Insertion delimiter] = "\n\n"

packages/common/src/scopeSupportFacets/markdown.ts

@@ -9,5 +9,6 @@ const { supported, unsupported, notApplicable } = ScopeSupportFacetLevel;
 export const markdownScopeSupport: LanguageScopeSupportFacetMap = {
   "comment.line": supported,
   "comment.block": supported,
+  section: supported,
   notebookCell: supported,
 };

packages/common/src/scopeSupportFacets/scopeSupportFacetInfos.ts

@@ -38,6 +38,11 @@ export const scopeSupportFacetInfos: Record<
     scopeType: "environment",
   },
 
+  section: {
+    description: "A document section",
+    scopeType: "section",
+  },
+
   list: {
     description: "A list/array",
     scopeType: "list",

packages/common/src/scopeSupportFacets/scopeSupportFacets.types.ts

@@ -11,6 +11,8 @@ const scopeSupportFacets = [
 
   "environment",
 
+  "section",
+
   "list",
   "map",
   "ifStatement",
@@ -162,7 +164,6 @@ const scopeSupportFacets = [
   "notebookCell",
 
   // FIXME: Still in legacy
-  // section
   // selector
   // unit
   // collectionItem

packages/cursorless-engine/src/languages/LegacyLanguageId.ts

@@ -7,7 +7,6 @@ export const legacyLanguageIds = [
   "csharp",
   "css",
   "latex",
-  "markdown",
   "php",
   "ruby",
   "rust",

packages/cursorless-engine/src/languages/TreeSitterQuery/queryPredicateOperators.ts

@@ -168,10 +168,12 @@ class TrimEnd extends QueryPredicateOperator<TrimEnd> {
     const { document, range } = nodeInfo;
     const text = document.getText(range);
     const whitespaceLength = text.length - text.trimEnd().length;
-    nodeInfo.range = new Range(
-      range.start,
-      adjustPosition(document, range.end, -whitespaceLength),
-    );
+    if (whitespaceLength > 0) {
+      nodeInfo.range = new Range(
+        range.start,
+        adjustPosition(document, range.end, -whitespaceLength),
+      );
+    }
     return true;
   }
 }

packages/cursorless-engine/src/languages/getNodeMatcher.ts

@@ -12,7 +12,6 @@ import clojure from "./clojure";
 import { LegacyLanguageId } from "./LegacyLanguageId";
 import csharp from "./csharp";
 import latex from "./latex";
-import markdown from "./markdown";
 import php from "./php";
 import { patternMatchers as ruby } from "./ruby";
 import rust from "./rust";
@@ -51,7 +50,6 @@ export const languageMatchers: Record<
   csharp,
   css: scss,
   latex,
-  markdown,
   php,
   ruby,
   rust,

queries/markdown.scm

@@ -75,3 +75,61 @@
   (#trim-end! @notebookCell)
   (#insertion-delimiter! @notebookCell "\n\n")
 )
+
+;;!! # H1
+;;!! ## H2
+(
+  (section) @section @_.removal
+  (#trim-end! @section)
+)
+
+;;!! # H1
+(
+  (section
+    (atx_heading
+      (atx_h1_marker)
+    )
+  ) @sectionLevelOne @_.removal
+  (#trim-end! @sectionLevelOne)
+)
+;;!! ## H2
+(
+  (section
+    (atx_heading
+      (atx_h2_marker)
+    )
+  ) @sectionLevelTwo @_.removal
+  (#trim-end! @sectionLevelTwo)
+)
+(
+  (section
+    (atx_heading
+      (atx_h3_marker)
+    )
+  ) @sectionLevelThree @_.removal
+  (#trim-end! @sectionLevelThree)
+)
+(
+  (section
+    (atx_heading
+      (atx_h4_marker)
+    )
+  ) @sectionLevelFour @_.removal
+  (#trim-end! @sectionLevelFour)
+)
+(
+  (section
+    (atx_heading
+      (atx_h5_marker)
+    )
+  ) @sectionLevelFive @_.removal
+  (#trim-end! @sectionLevelFive)
+)
+(
+  (section
+    (atx_heading
+      (atx_h6_marker)
+    )
+  ) @sectionLevelSix @_.removal
+  (#trim-end! @sectionLevelSix)
+)