pyright: strict mode

Author: guille

RSpecCreateModule.py

@@ -41,6 +41,7 @@ def run(self, edit: sublime.Edit, line: int = 0, column: int = 0):
         self.view.sel().add(sublime.Region(pt))
 
         self.view.show(pt)
+        # NOTE: Adjust for user-preferences, or just maybe remove entirely
         self.view.insert(edit, pt, "  ")
 
     def is_visible(self):

RSpecToggleSourceOrSpec.py

@@ -1,6 +1,7 @@
 import os
 import re
 from pathlib import Path
+from typing import Iterator
 
 import sublime
 import sublime_plugin
@@ -33,15 +34,15 @@ def run(self):
             test_matcher = re.compile(r"[/\\]" + base_name + r"_spec\.rb$")
             self.open_project_file(test_matcher, current_file_path)
 
-    def open_project_file(self, file_matcher, file_path):
+    def open_project_file(self, file_matcher: re.Pattern[str], file_path: str):
         for path, _, filenames in self.walk_project_folder(file_path):
             for filename in filter(lambda f: f.endswith(".rb"), filenames):
                 current_file = os.path.join(path, filename)
                 if file_matcher.search(current_file):
                     return self.switch_to(os.path.join(path, filename))
         print("RSpec: No matching files found")
 
-    def spec_paths(self, file_path):
+    def spec_paths(self, file_path: str):
         return [
             self.batch_replace(
                 file_path, (r"\b(?:app|lib)\b", "spec"), (r"\b(\w+)\.rb", r"\1_spec.rb")
@@ -53,15 +54,15 @@ def spec_paths(self, file_path):
             ),
         ]
 
-    def code_paths(self, file_path):
+    def code_paths(self, file_path: str):
         file_path = re.sub(r"\b(\w+)_spec\.rb$", r"\1.rb", file_path)
         return [
             re.sub(r"\bspec\b", "app", file_path),
             re.sub(r"\bspec\b", "lib", file_path),
             re.sub(r"\b{}\b".format(os.path.join("spec", "lib")), "lib", file_path),
         ]
 
-    def quick_find(self, file_path):
+    def quick_find(self, file_path: str):
         if re.search(r"\bspec\b|_spec\.rb$", file_path):
             for path in self.code_paths(file_path):
                 if os.path.exists(path):
@@ -72,28 +73,34 @@ def quick_find(self, file_path):
                     return self.switch_to(path)
         print("RSpec: quick find failed, doing regular find")
 
-    def batch_replace(self, string, *pairs):
+    def batch_replace(self, string: str, *pairs: "tuple[str, str]") -> str:
+        string = ""
         for target, replacement in pairs:
             string = re.sub(target, replacement, string)
-        return string
+        return str(string)
 
-    def switch_to(self, file_path):
+    def switch_to(self, file_path: str):
         group = shared.other_group_in_pair(self.window)
         self.window.open_file(file_path)
         self.window.run_command("move_to_group", {"group": group})
         print("Opened: " + file_path)
         return True
 
-    def walk_project_folder(self, file_path):
+    def walk_project_folder(
+        self, file_path: str
+    ) -> "Iterator[tuple[str, list[str], list[str]]]":
         for folder in self.window.folders():
             if not file_path.startswith(folder):
                 continue
             yield from os.walk(folder)
 
     def is_enabled(self):
         view = self.window.active_view()
-        return view and self._is_ruby_file(view)
+        return view is not None and self._is_ruby_file(view)
 
-    def _is_ruby_file(self, view: sublime.View):
+    def _is_ruby_file(self, view: sublime.View) -> bool:
         syntax = view.syntax()
-        return syntax and syntax.scope in ("source.ruby", "source.ruby.rspec")
+        return syntax is not None and syntax.scope in (
+            "source.ruby",
+            "source.ruby.rspec",
+        )

pyrightconfig.json

@@ -6,7 +6,7 @@
     "/opt/sublime_text/Lib/python3",
     "/opt/sublime_text/Packages",
   ],
-  "typeCheckingMode": "basic",
+  "typeCheckingMode": "strict",
   "executionEnvironments": [
     {
       "root": "./",