Clean up

Author: AndreasArvidsson

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

@@ -98,27 +98,6 @@ function unwrapGroupParens(
   };
 }
 
-function extendToNamedSiblingIfExists(
-  editor: TextEditor,
-  node: Node,
-): SelectionWithContext {
-  const startIndex = node.startIndex;
-  let endIndex = node.endIndex;
-  const sibling = node.nextNamedSibling;
-
-  if (sibling != null && sibling.isNamed) {
-    endIndex = sibling.endIndex;
-  }
-
-  return {
-    selection: new Selection(
-      editor.document.positionAt(startIndex),
-      editor.document.positionAt(endIndex),
-    ),
-    context: {},
-  };
-}
-
 const nodeMatchers: Partial<
   Record<SimpleScopeTypeType, NodeMatcherAlternative>
 > = {

queries/latex.scm

@@ -125,38 +125,19 @@
   (end)
 ] @functionCall
 
-(subparagraph
-  command: _ @functionCall.start
-  .
-  (_)? @functionCall.end
-)
-(paragraph
-  command: _ @functionCall.start
-  .
-  (_)? @functionCall.end
-)
-(subsubsection
-  command: _ @functionCall.start
-  .
-  (_)? @functionCall.end
-)
-(subsection
-  command: _ @functionCall.start
-  .
-  (_)? @functionCall.end
-)
-(section
-  command: _ @functionCall.start
-  .
-  (_)? @functionCall.end
-)
-(chapter
-  command: _ @functionCall.start
-  .
-  (_)? @functionCall.end
-)
-(part
-  command: _ @functionCall.start
-  .
-  (_)? @functionCall.end
+(
+  (_
+    command: _ @functionCall.start
+    .
+    (_)? @functionCall.end
+  ) @_dummy
+  (#type?
+    @_dummy
+    paragraph
+    subsubsection
+    subsection
+    section
+    chapter
+    part
+  )
 )