giga refactor (#2)

Giga refactoring, improved code, structure and features. - Improve error handling and alert windows - Add go to error line feature - Improve document will/did save error handling
vigo · May 10, 2024 · 958cc18 · 958cc18
1 parent e0ff35e
commit 958cc18
Show file tree

Hide file tree

Showing 23 changed files with 935 additions and 333 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -0,0 +1,17 @@
+# Change Log
+
+**2024-05-10**
+
+Giga refactoring, improved code, structure and features.
+
+- Improve error handling and alert windows
+- Add go to error line feature
+- Improve document will/did save error handling
+
+**2024-05-06**
+
+Mega refactoring, improved code structure and speed.
+
+- Remove `TM_PYRUFF_DEBUG` TextMate variable.
+- Add logging mechanism
+- Speed improvements, integrated and tested on `ruff` version `0.4.2`
diff --git a/Commands/Auto fix errors.tmCommand b/Commands/Auto fix errors.tmCommand
@@ -6,26 +6,26 @@
 	<string>nop</string>
 	<key>command</key>
 	<string>#!/usr/bin/env ruby18 -wKU
-require "#{ENV['TM_BUNDLE_SUPPORT']}/helper"
 
-Ruff.auto_fix_errors
-</string>
+require ENV["TM_BUNDLE_SUPPORT"] + "/ruff_linter"
+
+RuffLinter.run_document_will_save</string>
 	<key>input</key>
 	<string>document</string>
 	<key>inputFormat</key>
 	<string>text</string>
 	<key>name</key>
-	<string>Auto fix errors</string>
+	<string>Document Will Save</string>
 	<key>outputCaret</key>
 	<string>interpolateByLine</string>
 	<key>outputFormat</key>
 	<string>text</string>
 	<key>outputLocation</key>
 	<string>replaceDocument</string>
 	<key>scope</key>
-	<string>source.python</string>
+	<string>source.python.ruff</string>
 	<key>semanticClass</key>
-	<string>callback.document.will-save.1</string>
+	<string>callback.document.will-save.50</string>
 	<key>uuid</key>
 	<string>F2DC6971-9B06-4593-9EC6-D467AADB43AF</string>
 	<key>version</key>

diff --git a/Commands/Go to error line.tmCommand b/Commands/Go to error line.tmCommand
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>autoScrollOutput</key>
+	<true/>
+	<key>beforeRunningCommand</key>
+	<string>nop</string>
+	<key>command</key>
+	<string>#!/usr/bin/env ruby18 -wKU
+
+require ENV['TM_SUPPORT_PATH'] + '/lib/ui'
+
+TM_DOCUMENT_UUID = ENV["TM_DOCUMENT_UUID"]
+
+filename = "/tmp/textmate-ruff-#{TM_DOCUMENT_UUID}.goto"
+if File.exist?(filename)
+  errors = File.read(filename)
+
+  if errors
+    errors = errors.split("\n").sort
+    selected_index = TextMate::UI.menu(errors)
+
+    unless selected_index.nil?
+      selected_error = errors[selected_index]
+      if selected_error
+        line = selected_error.split(" ").first
+        system(ENV["TM_MATE"], "--uuid", TM_DOCUMENT_UUID, "--line", line)
+      end
+    end
+
+  end
+end
+</string>
+	<key>input</key>
+	<string>none</string>
+	<key>inputFormat</key>
+	<string>text</string>
+	<key>keyEquivalent</key>
+	<string>~g</string>
+	<key>name</key>
+	<string>Go to error line</string>
+	<key>outputCaret</key>
+	<string>interpolateByChar</string>
+	<key>outputFormat</key>
+	<string>text</string>
+	<key>outputLocation</key>
+	<string>discard</string>
+	<key>scope</key>
+	<string>source.python.ruff</string>
+	<key>uuid</key>
+	<string>40241AB3-EAF3-4967-8F02-555020846FB4</string>
+	<key>version</key>
+	<integer>2</integer>
+</dict>
+</plist>
diff --git a/Commands/NOQAlizer all.tmCommand b/Commands/NOQAlizer all.tmCommand
@@ -6,16 +6,17 @@
 	<string>nop</string>
 	<key>command</key>
 	<string>#!/usr/bin/env ruby18 -wKU
-require "#{ENV['TM_BUNDLE_SUPPORT']}/helper"
 
-Ruff.noqalize_all
+require ENV["TM_BUNDLE_SUPPORT"] + "/ruff_linter"
+
+RuffLinter.noqalize_all
 </string>
 	<key>input</key>
 	<string>document</string>
 	<key>inputFormat</key>
 	<string>text</string>
 	<key>keyEquivalent</key>
-	<string>^N</string>
+	<string>~a</string>
 	<key>name</key>
 	<string>NOQAlizer all</string>
 	<key>outputCaret</key>

diff --git a/.../Show rules for existing errors.tmCommand → Commands/Run Autofix Manually.tmCommand b/.../Show rules for existing errors.tmCommand → Commands/Run Autofix Manually.tmCommand
@@ -6,28 +6,28 @@
 	<string>nop</string>
 	<key>command</key>
 	<string>#!/usr/bin/env ruby18 -wKU
-require "#{ENV['TM_BUNDLE_SUPPORT']}/helper"
 
-Ruff.show_rules
-</string>
+require ENV["TM_BUNDLE_SUPPORT"] + "/ruff_linter"
+
+RuffLinter.run_document_will_save(:autofix =&gt; true)</string>
 	<key>input</key>
 	<string>document</string>
 	<key>inputFormat</key>
 	<string>text</string>
 	<key>keyEquivalent</key>
-	<string>^R</string>
+	<string>~f</string>
 	<key>name</key>
-	<string>Show rules for existing errors</string>
+	<string>Run Autofix Manually</string>
 	<key>outputCaret</key>
-	<string>interpolateByLine</string>
+	<string>afterOutput</string>
 	<key>outputFormat</key>
 	<string>text</string>
 	<key>outputLocation</key>
-	<string>discard</string>
+	<string>replaceDocument</string>
 	<key>scope</key>
-	<string>source.python</string>
+	<string>source.python.ruff</string>
 	<key>uuid</key>
-	<string>7F9DF791-D14A-44AD-A580-75EA74F28895</string>
+	<string>D16E4203-64E5-46BF-B8B9-6B5AABA4795B</string>
 	<key>version</key>
 	<integer>2</integer>
 </dict>

diff --git a/Commands/Run Ruff Linter on save.tmCommand b/Commands/Run Ruff Linter on save.tmCommand
@@ -6,26 +6,26 @@
 	<string>nop</string>
 	<key>command</key>
 	<string>#!/usr/bin/env ruby18 -wKU
-require "#{ENV['TM_BUNDLE_SUPPORT']}/helper"
 
-Ruff.run_ruff_linter
-</string>
+require ENV["TM_BUNDLE_SUPPORT"] + "/ruff_linter"
+
+RuffLinter.run_document_did_save</string>
 	<key>input</key>
 	<string>document</string>
 	<key>inputFormat</key>
 	<string>text</string>
 	<key>name</key>
-	<string>Run Ruff Linter on save</string>
+	<string>Document Did Save</string>
 	<key>outputCaret</key>
 	<string>interpolateByLine</string>
 	<key>outputFormat</key>
 	<string>text</string>
 	<key>outputLocation</key>
 	<string>discard</string>
 	<key>scope</key>
-	<string>source.python</string>
+	<string>source.python.ruff</string>
 	<key>semanticClass</key>
-	<string>callback.document.did-save.1</string>
+	<string>callback.document.did-save.50</string>
 	<key>uuid</key>
 	<string>9DB6C68B-B678-40FA-962B-799733FCA199</string>
 	<key>version</key>