harlequin 2.0.3__tar.gz → 2.0.4__tar.gz

{harlequin-2.0.3 → harlequin-2.0.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: harlequin
-Version: 2.0.3
+Version: 2.0.4
 Summary: The SQL IDE for Your Terminal.
 Home-page: https://harlequin.sh
 License: MIT

{harlequin-2.0.3 → harlequin-2.0.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "harlequin"
-version = "2.0.3"
+version = "2.0.4"
 description = "The SQL IDE for Your Terminal."
 authors = ["Ted Conbeer <tconbeer@users.noreply.github.com>"]
 license = "MIT"

{harlequin-2.0.3 → harlequin-2.0.4}/src/harlequin/app.py

@@ -113,9 +113,9 @@ class QueryError(Message):
 
 
 class QuerySubmitted(Message):
-    def __init__(self, query_text: str, limit: int | None) -> None:
+    def __init__(self, queries: list[str], limit: int | None) -> None:
         super().__init__()
-        self.query_text = query_text.strip()
+        self.queries = queries
         self.limit = limit
         self.submitted_at = time.monotonic()
 
@@ -317,7 +317,7 @@ class Harlequin(AppBase):
         message.stop()
         self.post_message(
             QuerySubmitted(
-                query_text=self._get_query_text(),
+                queries=self._get_selected_queries(),
                 limit=self.run_query_bar.limit_value,
             )
         )
@@ -365,7 +365,8 @@ class Harlequin(AppBase):
         message.stop()
         self.post_message(
             QuerySubmitted(
-                query_text=self._get_query_text(), limit=self.run_query_bar.limit_value
+                queries=self._get_selected_queries(),
+                limit=self.run_query_bar.limit_value,
             )
         )
 
@@ -512,7 +513,7 @@ class Harlequin(AppBase):
         ):
             self.post_message(
                 QuerySubmitted(
-                    query_text=self._get_query_text(),
+                    queries=self._get_selected_queries(),
                     limit=self.run_query_bar.limit_value,
                 )
             )
@@ -755,7 +756,7 @@ class Harlequin(AppBase):
     def execute_query(self, message: QuerySubmitted) -> None:
         if self.connection is None:
             return
-        if message.query_text:
+        if message.queries:
             self.full_screen = False
             self.run_query_bar.set_not_responsive()
             self.results_viewer.show_loading()
@@ -1005,7 +1006,7 @@ class Harlequin(AppBase):
         if self.connection is None:
             return
         cursors: Dict[str, tuple[HarlequinCursor, str]] = {}
-        queries = self._split_query_text(message.query_text)
+        queries = message.queries
         ddl_queries: list[str] = []
         for q in queries:
             try:
@@ -1043,14 +1044,10 @@ class Harlequin(AppBase):
         self.connection.cancel()
         self.post_message(QueriesCanceled())
 
-    def _get_query_text(self) -> str:
+    def _get_selected_queries(self) -> list[str]:
         if self.editor is None:
-            return ""
-        return (
-            self._validate_selection()
-            or self.editor.current_query
-            or self.editor.previous_query
-        )
+            return []
+        return self.editor.selected_queries()
 
     @staticmethod
     def _split_query_text(query_text: str) -> List[str]:

{harlequin-2.0.3 → harlequin-2.0.4}/src/harlequin/components/code_editor.py

@@ -1,6 +1,5 @@
 from __future__ import annotations
 
-import re
 from typing import List, Union
 
 from rich.text import TextType
@@ -20,6 +19,8 @@ from harlequin.messages import WidgetMounted
 
 
 class CodeEditor(TextEditor, inherit_bindings=False):
+    SEMICOLON_QUERY = '(";" @semicolon)'
+
     class Submitted(Message, bubble=True):
         """Posted when user runs the query.
 
@@ -32,56 +33,43 @@ class CodeEditor(TextEditor, inherit_bindings=False):
             super().__init__()
             self.text = text
 
-    @property
-    def current_query(self) -> str:
+    def selected_queries(self) -> list[str]:
+        """
+        Returns the list of queries that intersect
+        with the current selection.
+        """
         if self.text_input is None:
-            return ""
-        semicolons = self._semicolons
+            return []
 
-        if not semicolons:
-            return self.text
-
-        before = (0, 0)
-        after: Union[None, tuple[int, int]] = None
-        for c in semicolons:
-            if c <= self.selection.end:
-                before = c
-            elif after is None and c > self.selection.end:
-                after = c
-                break
-        else:
-            lno = self.text_input.document.line_count - 1
-            after = (lno, len(self.text_input.document.get_line(lno)))
-        return self.text_input.get_text_range(
-            start=(before[0], before[1]), end=(after[0], after[1])
-        ).strip()
-
-    @property
-    def previous_query(self) -> str:
-        if self.text_input is None:
-            return ""
-        semicolons = self._semicolons
+        semicolons = self._query_semicolons()
 
         if not semicolons:
-            return self.text
-
-        first = (0, 0)
-        second = (0, 0)
-        for c in semicolons:
-            if c <= self.selection.end:
-                first = second
-                second = c
-            elif c > self.selection.end:
+            return [self.text]
+
+        queries: list[str] = []
+        prev_query: str | None = None
+        query_start = (0, 0)
+        for query_end in [*semicolons, self.text_input.document.end]:
+            if query_start > self.selection.end:
                 break
+            q = self.text_input.get_text_range(start=query_start, end=query_end).strip()
+            if q and query_end >= self.selection.start:
+                queries.append(q)
+            elif q:
+                prev_query = q
+            query_start = query_end
+
+        if not queries and prev_query:
+            return [prev_query]
 
-        return self.text_input.get_text_range(
-            start=(first[0], first[1]), end=(second[0], second[1])
-        ).strip()
+        return queries
 
     def on_mount(self) -> None:
         self.post_message(EditorCollection.EditorSwitched(active_editor=self))
         self.post_message(WidgetMounted(widget=self))
         self.has_shown_clipboard_error = False
+        self.has_shown_tree_sitter_error = False
+        self._semicolon_query = self.prepare_query(self.SEMICOLON_QUERY)
 
     def on_unmount(self) -> None:
         self.post_message(EditorCollection.EditorSwitched(active_editor=None))
@@ -128,13 +116,33 @@ class CodeEditor(TextEditor, inherit_bindings=False):
         if hasattr(self.app, "action_focus_data_catalog"):
             self.app.action_focus_data_catalog()
 
-    @property
-    def _semicolons(self) -> list[tuple[int, int]]:
-        semicolons: list[tuple[int, int]] = []
-        for i, line in enumerate(self.text.splitlines()):
-            for pos in [m.span()[1] for m in re.finditer(";", line)]:
-                semicolons.append((i, pos))
-        return semicolons
+    def _query_semicolons(self) -> list[tuple[int, int]]:
+        if self.text_input is None:
+            return []
+
+        if self.text_input.is_syntax_aware:
+            assert self._semicolon_query is not None
+            query_result = self.query_syntax_tree(query=self._semicolon_query)
+            return [n.end_point for n in query_result.get("semicolon", [])]
+        else:
+            # tree-sitter is not installed. naively split on semicolons and
+            # show a warning.
+            import re
+
+            if not self.has_shown_tree_sitter_error:
+                self.app.notify(
+                    "Tree-sitter is not installed. Syntax highlighting and query "
+                    "splitting may not work as expected.\n"
+                    "See https://harlequin.sh/docs/troubleshooting/tree-sitter",
+                    severity="warning",
+                    timeout=10,
+                )
+                self.has_shown_tree_sitter_error = True
+            semicolons: list[tuple[int, int]] = []
+            for i, line in enumerate(self.text.splitlines()):
+                for pos in [m.span()[1] for m in re.finditer(";", line)]:
+                    semicolons.append((i, pos))
+            return semicolons
 
 
 class EditorCollection(TabbedContent):