Update references to syntax files in plugins

Author: FichteFoll

Package/Sublime Text Snippet/Sublime Snippet (Raw).sublime-syntax renamed to Package/Sublime Text Snippet/Sublime Text Snippet (Raw).sublime-syntax

@@ -9,7 +9,8 @@
 
 PLUGIN_NAME = get_package_name()
 
-BUILD_SYSTEM_SYNTAX = ("Packages/%s/Syntax Definitions/Sublime Text Build System.tmLanguage"
+BUILD_SYSTEM_SYNTAX = ("Packages/%s/Package/"
+                       "Sublime Text Build System/Sublime Text Build System.tmLanguage"
                        % PLUGIN_NAME)
 
 

build_sys_dev.py

@@ -13,7 +13,7 @@
 
 PLUGIN_NAME = get_package_name()
 
-SYNTAX_DEF = "Packages/%s/Syntax Definitions/Sublime Commands.tmLanguage" % PLUGIN_NAME
+SYNTAX_DEF = "Packages/%s/Package/Sublime Text Commands/Sublime Commands.tmLanguage" % PLUGIN_NAME
 
 
 class NewCommandsFileCommand(sublime_plugin.WindowCommand):

commands_file_dev.py

@@ -9,7 +9,8 @@
 
 PLUGIN_NAME = get_package_name()
 
-COMPLETIONS_SYNTAX_DEF = ("Packages/%s/Syntax Definitions/Sublime Completions.tmLanguage"
+COMPLETIONS_SYNTAX_DEF = ("Packages/%s/Package/"
+                          "Sublime Text Completions/Sublime Completions.tmLanguage"
                           % PLUGIN_NAME)
 TPL = """{
     "scope": "source.${1:off}",

completions_dev.py

@@ -10,8 +10,9 @@
 
 PLUGIN_NAME = get_package_name()
 
-SETTINGS_SYNTAX = "Packages/%s/Syntax Definitions/Sublime Settings.tmLanguage" % PLUGIN_NAME
-TPL = """{\n\t$0\n}"""
+SETTINGS_SYNTAX = ("Packages/%s/Package/Sublime Text Settings/Sublime Settings.tmLanguage"
+                   % PLUGIN_NAME)
+TPL = "{\n\t$0\n}"
 
 
 class NewSettingsCommand(sublime_plugin.WindowCommand):

settings_dev.py

@@ -14,9 +14,11 @@
 
 PLUGIN_NAME = get_package_name()
 
-RAW_SNIPPETS_SYNTAX = ("Packages/%s/Syntax Definitions/Sublime Snippet (Raw).tmLanguage"
+RAW_SNIPPETS_SYNTAX = ("Packages/%s/"
+                       "Package/Sublime Text Snippet/Sublime Text Snippet (Raw).sublime-syntax"
                        % PLUGIN_NAME)
-XML_SYNTAX = "Packages/XML/XML.tmLanguage"
+SNIPPETS_SYNTAX = ("Packages/%s/Package/Sublime Text Snippet/Sublime Text Snippet.sublime-syntax"
+                   % PLUGIN_NAME)
 
 
 TPL = """<snippet>
@@ -36,13 +38,13 @@ def run(self):
 
 class GenerateSnippetFromRawSnippetCommand(sublime_plugin.TextCommand):
     def is_enabled(self):
-        return self.view.match_selector(0, 'source.sublimesnippetraw')
+        return self.view.match_selector(0, 'source.sublime.snippet')
 
     def run(self, edit):
         content = get_text(self.view)
         clear(self.view)
         self.view.run_command('insert_snippet', {'contents': TPL})
-        self.view.set_syntax_file(XML_SYNTAX)
+        self.view.set_syntax_file(SNIPPETS_SYNTAX)
         # Insert existing contents into CDATA section. We rely on the fact
         # that Sublime will place the first selection in the first field of
         # the newly inserted snippet.
@@ -70,7 +72,7 @@ class CopyAndInsertRawSnippetCommand(sublime_plugin.TextCommand):
     files.
     """
     def is_enabled(self):
-        return self.view.match_selector(0, 'source.sublimesnippetraw')
+        return self.view.match_selector(0, 'source.sublime.snippet')
 
     def run(self, edit):
         snip = get_text(self.view)

snippet_dev.py

@@ -35,7 +35,8 @@
 PLUGIN_NAME = get_package_name()
 
 # Must be forward slashes (no os.path.join)!
-SYNTAX_LANGUAGE_TMPL = ("Packages/%s/Syntax Definitions/Sublime Text Syntax Def (%%s).tmLanguage"
+SYNTAX_LANGUAGE_TMPL = ("Packages/%s/Package/TextMate Syntax Definition (%%s)/"
+                        "TextMate Syntax Definition (%%s).tmLanguage"
                         % PLUGIN_NAME)
 XML_SYNTAX_LANGUAGE = "Packages/XML/XML.tmLanguage"
 
@@ -110,7 +111,7 @@ def run(self, fmt='yaml'):
         if fmt == 'plist':
             view.set_syntax_file(XML_SYNTAX_LANGUAGE)
         else:
-            view.set_syntax_file(SYNTAX_LANGUAGE_TMPL % fmt.upper())
+            view.set_syntax_file(SYNTAX_LANGUAGE_TMPL % (fmt.upper(), fmt.upper()))
 
         view.run_command('insert_snippet', {'contents': boilerplates[fmt] % uuid.uuid4()})