Latex scope migration

cursorless-dev · May 18, 2024 · ba0db61 · ba0db61
1 parent 2b6475e
commit ba0db61
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 20 deletions.
diff --git a/packages/cursorless-engine/src/languages/latex.ts b/packages/cursorless-engine/src/languages/latex.ts
@@ -83,15 +83,6 @@ const SECTIONING = [
   "part",
 ];
 
-const ENVIRONMENTS = [
-  "generic_environment",
-  "comment_environment",
-  "verbatim_environment",
-  "listing_environment",
-  "minted_environment",
-  "pycode_environment",
-];
-
 const sectioningText = SECTIONING.map((s) => `${s}[text]`);
 const sectioningCommand = SECTIONING.map((s) => `${s}[command]`);
 
@@ -197,20 +188,9 @@ const nodeMatchers: Partial<
     matcher(patternFinder(...sectioningText), unwrapGroupParens),
     patternMatcher("begin[name][text]", "end[name][text]"),
   ),
-  functionCallee: "command_name",
 
   collectionItem: matcher(patternFinder("enum_item"), extractItemContent),
 
-  part: "part",
-  chapter: "chapter",
-  section: "section",
-  subSection: "subsection",
-  subSubSection: "subsubsection",
-  namedParagraph: "paragraph",
-  subParagraph: "subparagraph",
-
-  environment: ENVIRONMENTS,
-  xmlElement: ENVIRONMENTS,
   xmlBothTags: getTags,
   xmlStartTag: getStartTag,
   xmlEndTag: getEndTag,

diff --git a/queries/latex.scm b/queries/latex.scm
@@ -2,3 +2,22 @@
   (block_comment)
   (line_comment)
 ] @comment
+
+(command_name) @functionCallee
+
+(part) @part
+(chapter) @chapter
+(section) @section
+(subSection) @subsection
+(subSubSection) @subsubsection
+(namedParagraph) @paragraph
+(subParagraph) @subparagraph
+
+[
+  (generic_environment)
+  (comment_environment)
+  (verbatim_environment)
+  (listing_environment)
+  (minted_environment)
+  (pycode_environment)
+] @environment @xmlElement