refactor: replace "first()" with "first_true()" from "more_itertools"

Signed-off-by: Jack Cherng <[email protected]>

.github/workflows/python.yml

@@ -26,6 +26,9 @@ jobs:
     name: ${{ matrix.python-version }}
     runs-on: ${{ matrix.os }}
 
+    env:
+      UV_SYSTEM_PYTHON: 1
+
     strategy:
       matrix:
         os: ['ubuntu-latest']
@@ -44,7 +47,7 @@ jobs:
       - name: Install dependencies
         run: |
           python -m pip install -U uv
-          make UV_INSTALL_FLAGS="--system" install
+          make install-dev
 
       - name: Do linting
         run: |

Makefile

@@ -7,9 +7,14 @@ all:
 install:
 	uv pip install $(UV_INSTALL_FLAGS) -r requirements.txt
 
+.PHONY: install-dev
+install-dev:
+	uv pip install $(UV_INSTALL_FLAGS) -r requirements-dev.txt
+
 .PHONY: pip-compile
 pip-compile:
 	uv pip compile --upgrade requirements.in -o requirements.txt
+	uv pip compile --upgrade requirements-dev.in -o requirements-dev.txt
 
 .PHONY: ci-check
 ci-check:

dependencies.json

@@ -2,6 +2,7 @@
     "*": {
         "*": [
             "lsp_utils",
+            "more-itertools",
             "sublime_lib"
         ]
     }

plugin/ui/completion.py

@@ -7,11 +7,11 @@
 
 import mdpopups
 import sublime
+from more_itertools import first_true
 
 from ..types import CopilotPayloadCompletion
 from ..utils import (
     clamp,
-    first,
     fix_completion_syntax_highlight,
     get_copilot_view_setting,
     get_view_language_id,
@@ -95,7 +95,7 @@ def current_completion(self) -> CopilotPayloadCompletion | None:
 
     @property
     def completion_style_type(self) -> type[_BaseCompletion]:
-        completion_cls = first(_BaseCompletion.__subclasses__(), lambda t: t.name == self.completion_style)
+        completion_cls = first_true(_BaseCompletion.__subclasses__(), pred=lambda t: t.name == self.completion_style)
         if completion_cls:
             return completion_cls
         raise RuntimeError(f"Unknown completion style type: {self.completion_style}")

plugin/ui/panel_completion.py

@@ -5,12 +5,12 @@
 
 import mdpopups
 import sublime
+from more_itertools import first_true
 
 from ..types import CopilotPayloadPanelSolution, StLayout
 from ..utils import (
     all_views,
     find_view_by_id,
-    first,
     fix_completion_syntax_highlight,
     get_copilot_view_setting,
     get_view_language_id,
@@ -124,7 +124,7 @@ def find_view_by_panel_id(panel_id: str) -> sublime.View | None:
 
     @classmethod
     def from_sheet_id(cls, sheet_id: int) -> ViewPanelCompletionManager | None:
-        return first(map(cls, all_views()), lambda self: self.sheet_id == sheet_id)
+        return first_true(map(cls, all_views()), pred=lambda self: self.sheet_id == sheet_id)
 
     def open(self, *, completion_target_count: int | None = None) -> None:
         """Open the completion panel."""

plugin/utils.py

@@ -13,6 +13,7 @@
 from LSP.plugin.core.sessions import Session
 from LSP.plugin.core.types import basescope2languageid
 from LSP.plugin.core.url import filename_to_uri
+from more_itertools import first_true
 
 from .constants import COPILOT_VIEW_SETTINGS_PREFIX, PACKAGE_NAME
 from .types import CopilotPayloadCompletion, CopilotPayloadPanelSolution, T_Callable
@@ -82,25 +83,17 @@ def call_function() -> Any:
 
 
 def find_sheet_by_id(id: int) -> sublime.Sheet | None:
-    return first(all_sheets(include_transient=True), lambda sheet: sheet.id() == id)
+    return first_true(all_sheets(include_transient=True), pred=lambda sheet: sheet.id() == id)
 
 
 def find_view_by_id(id: int) -> sublime.View | None:
-    return first(all_views(include_transient=True), lambda view: view.id() == id)
+    return first_true(all_views(include_transient=True), pred=lambda view: view.id() == id)
 
 
 def is_active_view(obj: Any) -> bool:
     return bool(obj and obj == sublime.active_window().active_view())
 
 
-def first(items: Iterable[T], test: Callable[[T], bool] | None = None, default: T | None = None) -> T | None:
-    """
-    Gets the first item which satisfies the `test`. Otherwise, `default`.
-    If `test` is not given or `None`, the first truthy item will be returned.
-    """
-    return next(filter(test, items), default)
-
-
 def fix_completion_syntax_highlight(view: sublime.View, point: int, code: str) -> str:
     if view.match_selector(point, "source.php"):
         return f"<?php\n{code}"

requirements-dev.in

@@ -0,0 +1,4 @@
+-r requirements.in
+
+mypy
+ruff>=0.4

requirements-dev.txt

@@ -0,0 +1,12 @@
+# This file was autogenerated by uv via the following command:
+#    uv pip compile requirements-dev.in -o requirements-dev.txt
+more-itertools==10.2.0
+    # via -r requirements.in
+mypy==1.10.0
+    # via -r requirements-dev.in
+mypy-extensions==1.0.0
+    # via mypy
+ruff==0.4.6
+    # via -r requirements-dev.in
+typing-extensions==4.12.0
+    # via mypy

requirements.in

@@ -1,2 +1 @@
-mypy
-ruff>=0.4
+more-itertools>=10,<11

requirements.txt

@@ -1,8 +1,4 @@
 # This file was autogenerated by uv via the following command:
 #    uv pip compile requirements.in -o requirements.txt
-mypy==1.9.0
-mypy-extensions==1.0.0
-    # via mypy
-ruff==0.4.1
-typing-extensions==4.11.0
-    # via mypy
+more-itertools==10.2.0
+    # via -r requirements.in