Merge pull request #173 from TerminalFi/refine/copilotIgnore

Author: TerminalFi

plugin/__init__.py

@@ -19,7 +19,7 @@
     CopilotSignOutCommand,
 )
 from .listeners import EventListener, ViewEventListener, copilot_ignore_observer
-from .utils import CopilotIgnore
+from .utils import CopilotIgnore, all_windows
 
 __all__ = (
     # ST: core
@@ -51,6 +51,8 @@ def plugin_loaded() -> None:
     """Executed when this plugin is loaded."""
     CopilotPlugin.setup()
     copilot_ignore_observer.setup()
+    for window in all_windows():
+        CopilotIgnore(window).load_patterns()
 
 
 def plugin_unloaded() -> None:

plugin/client.py

@@ -45,6 +45,7 @@
 )
 from .ui import ViewCompletionManager, ViewPanelCompletionManager
 from .utils import (
+    CopilotIgnore,
     all_views,
     debounce,
     get_session_setting,
@@ -288,6 +289,12 @@ def update_status_bar_text(self, extra_variables: dict[str, Any] | None = None)
                 log_warning(f'Invalid "status_text" template: {e}')
         session.set_config_status_async(rendered_text)
 
+    @classmethod
+    def should_ignore(cls, view: sublime.View) -> bool:
+        if not (window := view.window()):
+            return False
+        return CopilotIgnore(window).trigger(view)
+
     @notification_handler(NTFY_FEATURE_FLAGS_NOTIFICATION)
     def _handle_feature_flags_notification(self, payload: CopilotPayloadFeatureFlagsNotification) -> None:
         pass

plugin/commands.py

@@ -27,7 +27,7 @@
     REQ_SIGN_IN_WITH_GITHUB_TOKEN,
     REQ_SIGN_OUT,
 )
-from .decorators import _must_be_active_view_not_ignored
+from .decorators import _must_be_active_view
 from .types import (
     CopilotPayloadFileStatus,
     CopilotPayloadGetVersion,
@@ -110,13 +110,7 @@ def _record_telemetry(
 
         session.send_request(Request(request, payload), lambda _: None)
 
-    @_must_be_active_view_not_ignored(failed_return=False)
-    @_provide_plugin_session(failed_return=False)
-    def is_enabled(self, plugin: CopilotPlugin, session: Session) -> bool:  # type: ignore
-        return self._can_meet_requirement(session)
-
-
-class CopilotIgnoreExemptTextCommand(CopilotTextCommand):
+    @_must_be_active_view(failed_return=False)
     @_provide_plugin_session(failed_return=False)
     def is_enabled(self, plugin: CopilotPlugin, session: Session) -> bool:  # type: ignore
         return self._can_meet_requirement(session)
@@ -129,7 +123,7 @@ def is_enabled(self) -> bool:
         return self._can_meet_requirement(session)
 
 
-class CopilotGetVersionCommand(CopilotIgnoreExemptTextCommand):
+class CopilotGetVersionCommand(CopilotTextCommand):
     requirement = REQUIRE_NOTHING
 
     @_provide_plugin_session()
@@ -288,7 +282,7 @@ def _on_result_check_file_status(self, payload: CopilotPayloadFileStatus) -> Non
         status_message("File is {} in session", payload["status"])
 
 
-class CopilotSignInCommand(CopilotIgnoreExemptTextCommand):
+class CopilotSignInCommand(CopilotTextCommand):
     requirement = REQUIRE_NOT_SIGN_IN
 
     @_provide_plugin_session()
@@ -327,7 +321,7 @@ def _on_result_sign_in_confirm(self, payload: CopilotPayloadSignInConfirm) -> No
         self.view.run_command("copilot_check_status")
 
 
-class CopilotSignInWithGithubTokenCommand(CopilotIgnoreExemptTextCommand):
+class CopilotSignInWithGithubTokenCommand(CopilotTextCommand):
     requirement = REQUIRE_NOT_SIGN_IN
 
     @_provide_plugin_session()
@@ -376,7 +370,7 @@ def _on_result_sign_in_confirm(self, payload: CopilotPayloadSignInConfirm) -> No
         self.view.run_command("copilot_check_status")
 
 
-class CopilotSignOutCommand(CopilotIgnoreExemptTextCommand):
+class CopilotSignOutCommand(CopilotTextCommand):
     requirement = REQUIRE_SIGN_IN
 
     @_provide_plugin_session()

plugin/decorators.py

@@ -3,16 +3,15 @@
 
 from .types import T_Callable
 from .utils import (
-    CopilotIgnore,
     is_active_view,
 )
 
 
-def _must_be_active_view_not_ignored(*, failed_return: Any = None) -> Callable[[T_Callable], T_Callable]:
+def _must_be_active_view(*, failed_return: Any = None) -> Callable[[T_Callable], T_Callable]:
     def decorator(func: T_Callable) -> T_Callable:
         @wraps(func)
         def wrapped(self: Any, *arg, **kwargs) -> Any:
-            if is_active_view(self.view) and not CopilotIgnore(self.view.window()).trigger(self.view):
+            if is_active_view(self.view):
                 return func(self, *arg, **kwargs)
             return failed_return
 

plugin/listeners.py

@@ -9,7 +9,7 @@
 from watchdog.observers import Observer
 
 from .client import CopilotPlugin
-from .decorators import _must_be_active_view_not_ignored
+from .decorators import _must_be_active_view
 from .ui import ViewCompletionManager, ViewPanelCompletionManager
 from .utils import (
     CopilotIgnore,
@@ -46,7 +46,7 @@ def _is_saving(self) -> bool:
     def _is_saving(self, value: bool) -> None:
         set_copilot_view_setting(self.view, "_is_saving", value)
 
-    @_must_be_active_view_not_ignored()
+    @_must_be_active_view()
     def on_modified_async(self) -> None:
         self._is_modified = True
 
@@ -60,20 +60,6 @@ def on_modified_async(self) -> None:
         if not self._is_saving and get_session_setting(session, "auto_ask_completions") and not vcm.is_waiting:
             plugin.request_get_completions(self.view)
 
-    def on_activated_async(self) -> None:
-        if (
-            (window := self.view.window())
-            and (plugin := CopilotPlugin.from_view(self.view))
-            and copilot_ignore_observer
-        ):
-            copilot_ignore_observer.add_folders(window.folders())
-            CopilotIgnore(window).load_patterns()
-            CopilotIgnore(window).trigger(self.view)
-            if get_copilot_view_setting(self.view, "is_copilot_ignored", False):
-                plugin.update_status_bar_text({"is_copilot_ignored": "ignored"})
-            else:
-                plugin.update_status_bar_text()
-
     def on_deactivated_async(self) -> None:
         ViewCompletionManager(self.view).hide()
 
@@ -121,6 +107,16 @@ def test(value: Any) -> bool | None:
 
         return None
 
+    def on_activated_async(self) -> None:
+        _, session = CopilotPlugin.plugin_session(self.view)
+        if (session and CopilotPlugin.should_ignore(self.view)) or (
+            not session and not CopilotPlugin.should_ignore(self.view)
+        ):
+            # Hacky way to trigger adding and removing views from session
+            prev_setting = self.view.settings().get("lsp_uri")
+            self.view.settings().set("lsp_uri", "")
+            sublime.set_timeout_async(lambda: self.view.settings().set("lsp_uri", prev_setting), 5)
+
     def on_post_text_command(self, command_name: str, args: dict[str, Any] | None) -> None:
         if command_name == "lsp_save":
             self._is_saving = True
@@ -133,7 +129,7 @@ def on_post_text_command(self, command_name: str, args: dict[str, Any] | None) -
     def on_post_save_async(self) -> None:
         self._is_saving = False
 
-    @_must_be_active_view_not_ignored()
+    @_must_be_active_view()
     def on_selection_modified_async(self) -> None:
         if not self._is_modified:
             ViewCompletionManager(self.view).handle_selection_change()

plugin/utils.py

@@ -23,6 +23,10 @@
 _T_Number = TypeVar("_T_Number", bound=Union[int, float])
 
 
+def all_windows() -> list[sublime.Window]:
+    return sublime.windows()
+
+
 def all_views(
     window: sublime.Window | None = None,
     *,
@@ -302,9 +306,6 @@ def cleanup(cls):
         for view in all_views():
             erase_copilot_view_setting(view, "is_copilot_ignored")
 
-    def log_info(self, message: str):
-        print(f"[COPILOT IGNORE] {message}\n")
-
     def unload_patterns(self):
         self.patterns.clear()
         erase_copilot_setting(self.window, COPILOT_WINDOW_SETTINGS_PREFIX, "copilotignore.patterns")
@@ -349,9 +350,4 @@ def trigger(self, view: sublime.View):
         if not file:
             return False
 
-        if self.matches_any_pattern(file):
-            set_copilot_view_setting(view, "is_copilot_ignored", True)
-            return True
-        else:
-            erase_copilot_view_setting(view, "is_copilot_ignored")
-            return False
+        return self.matches_any_pattern(file)

syntax/copilotignore.sublime-syntax

@@ -0,0 +1,20 @@
+%YAML 1.2
+---
+name: Copilot Ignore
+scope: text.copilotignore
+version: 2
+hidden: true
+hidden_file_extensions:
+  - .copilotignore
+
+contexts:
+  main:
+    - include: Git Common.sublime-syntax#comments
+    - match: '(?=\S)'
+      push: [pattern-content, Git Common.sublime-syntax#fnmatch-start]
+
+  pattern-content:
+    - meta_scope: string.unquoted.copilotignore entity.name.pattern.copilotignore
+    - match: $
+      pop: 1
+    - include: Git Common.sublime-syntax#fnmatch-unquoted-body