Merge branch 'development' into refactor/st3plus

SublimeText · Jan 6, 2024 · 22906b1 · 22906b1
2 parents 1615b07 + babb1a9
commit 22906b1
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 40 deletions.
diff --git a/Default.sublime-commands b/Default.sublime-commands
@@ -6,29 +6,13 @@
     {
         "caption": "CTags: Show Symbols (file)",
         "command": "show_symbols",
-        "context": [
-            {
-                "key": "selector",
-                "match_all": true,
-                "operand": "source -source.css",
-                "operator": "equal"
-            }
-        ]
     },
     {
         "caption": "CTags: Show Symbols (all)",
         "command": "show_symbols",
         "args": {
             "type": "multi"
-        },
-        "context": [
-            {
-                "key": "selector",
-                "match_all": true,
-                "operand": "source -source.css",
-                "operator": "equal"
-            }
-        ]
+        }
     },
     {
         "caption": "Preferences: CTags Settings",

diff --git a/Main.sublime-menu b/Main.sublime-menu
@@ -22,31 +22,16 @@
                 "command": "rebuild_tags"
               },
               {
+                "caption": "Show Symbols (file)",
                 "command": "show_symbols",
-                "context": [
-                  {
-                    "key": "selector",
-                    "match_all": true,
-                    "operand": "source -source.css",
-                    "operator": "equal"
-                  }
-                ]
               },
               {
+                "caption": "Show Symbols (all)",
+                "command": "show_symbols",
                 //"arg_comment": "TODO",
                 "args": {
                   "type": "multi"
                 },
-                "caption": "Show Symbols (all)",
-                "command": "show_symbols",
-                "context": [
-                  {
-                    "key": "selector",
-                    "match_all": true,
-                    "operand": "source -source.css",
-                    "operator": "equal"
-                  }
-                ]
               }
             ]
           }

diff --git a/README.rst b/README.rst
@@ -24,11 +24,9 @@ See this `forum thread`_ for a bit of historical background on the Sublime Text
 Installation
 ============
 
-The easiest way to install this plugin, is to use the `Package Control`_ 
-plugin, by `Will Bond`_
+The easiest way to install this plugin, is to use the `Package Control`_ .
 
-.. _Package Control: http://wbond.net/sublime_packages/package_control/
-.. _Will Bond: http://wbond.net/
+.. _Package Control: http://packagecontrol.io/
 
 Alternatively, the plugin can be installed manually using one of the following
 methods.
@@ -158,7 +156,7 @@ can be edited like any other ``.sublime-settings`` file
 
   or::
 
-    "command" : "C:\Users\<username>\Downloads\CTags\ctag.exe"
+    "command" : "C:\\Users\\<username>\\Downloads\\CTags\\ctag.exe"
 
 The rest of the options are fairly self explanatory.
 

diff --git a/plugins/cmds.py b/plugins/cmds.py
@@ -765,6 +765,17 @@ def run(self, view, args, tags_file):
 
             files = [key]
 
+        # Note: Help migrating existing tags files to new file name.
+        # Needed, because this plugin now sorts .tags file in-place,
+        # while former versions used to create a dedicated file.
+        sorted_tags_file = tags_file + '_sorted_by_file'
+        if os.path.isfile(sorted_tags_file):
+            try:
+                os.remove(tags_file)
+                os.rename(sorted_tags_file, tags_file)
+            except OSError:
+                pass
+
         base_path = get_common_ancestor_folder(
             view.file_name(), view.window().folders())