Added New command

dariusf · Nov 30, 2013 · ae3fbe8 · ae3fbe8
1 parent cfaa905
commit ae3fbe8
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 14 deletions.
diff --git a/Default.sublime-commands b/Default.sublime-commands
@@ -4,6 +4,11 @@
         "command": "synesthesia_delete",
         "args": {}
     },
+    {
+        "caption": "Synesthesia: New Highlighting Scheme",
+        "command": "synesthesia_new",
+        "args": {}
+    },
     {
         "caption": "Synesthesia: Compile Highlighting Scheme",
         "command": "synesthesia_compile",

diff --git a/compile.py b/compile.py
@@ -81,7 +81,7 @@ class HighlightingScheme():
 
 	"""
 
-	default_colours = templates.default_colours_template
+	default_colours = templates.default_colours
 
 	def __init__(self, directory, data):
 		self.directory = directory
@@ -104,7 +104,7 @@ def save(self, themename):
 				# prevents recursive dependency, since it only looks in the same directory
 				if i not in already_included:
 					already_included.append(i)
-					_, entries = load_json_data("%s%s%s.json" % (self.directory, PATH_SEPARATOR, i))
+					_, entries = load_json_data(os.path.join(self.directory, i + '.json'))
 					if "include" in entries:
 						inclusions.extend(entries["include"])
 					if "patterns" in entries:
@@ -135,14 +135,14 @@ def save(self, themename):
 		theme_scopes = concat_string_list(theme_scopes)
 
 		# produce output files
-		package_directory = sublime.packages_path() + PATH_SEPARATOR + "Synesthesia" + PATH_SEPARATOR
+		package_directory = os.path.join(sublime.packages_path(), "Synesthesia")
 		scope_filename = package_directory + themename + ".tmLanguage"
 		theme_filename = package_directory + themename + ".tmTheme"
 		settings_filename = package_directory + themename + ".sublime-settings"
-		write_file(scope_filename, templates.scope_template % (themename, patterns, "source" if autocompletion else "text", themename, uuid.uuid4()))
+		write_file(scope_filename, templates.scope % (themename, patterns, "source" if autocompletion else "text", themename, uuid.uuid4()))
 		print "Written to %s." % scope_filename
-		write_file(theme_filename, templates.theme_template % (themename, self.default_colours, theme_scopes, uuid.uuid4()))
+		write_file(theme_filename, templates.theme % (themename, self.default_colours, theme_scopes, uuid.uuid4()))
 		print "Written to %s." % theme_filename
-		write_file(settings_filename, templates.default_settings_template % themename)
+		write_file(settings_filename, templates.default_settings % themename)
 		print "Written to %s." % settings_filename
 		sublime.status_message("Highlighting scheme %s generated." % themename)
diff --git a/delete.py b/delete.py
@@ -1,8 +1,6 @@
 import sublime, sublime_plugin
 import os
 
-PATH_SEPARATOR = "\\" if sublime.platform() == "windows" else "/"
-
 def extract_syntax_name(path):
 	temp = path.split("/")
 	return temp[len(temp)-1].split(".")[0]
@@ -20,12 +18,12 @@ def done(self, which):
 				v.set_syntax_file("%s/Text/Plain text.tmLanguage" % sublime.packages_path())
 
 		# delete the files
-		package_directory = sublime.packages_path() + PATH_SEPARATOR + "Synesthesia" + PATH_SEPARATOR
+		package_directory = os.path.join(sublime.packages_path(), "Synesthesia")
 		files = ["%s.sublime-settings", "%s.tmLanguage", "%s.tmLanguage.cache", "%s.tmTheme", "%s.tmTheme.cache"]
 		files_deleted = False
 
 		for filepath in files:
-			filepath = package_directory + (filepath % which)
+			filepath = os.path.join(package_directory, filepath % which)
 			if os.path.exists(filepath):
 				os.remove(filepath)
 				files_deleted = True

diff --git a/new.py b/new.py
@@ -0,0 +1,11 @@
+import sublime, sublime_plugin
+import os, tempfile, webbrowser
+import templates
+
+class SynesthesiaNewCommand(sublime_plugin.WindowCommand):
+	def run(self):
+		v = self.window.new_file()
+		v.settings().set('default_dir', os.path.join(sublime.packages_path(), 'Synesthesia'))
+		v.set_syntax_file('Packages/JavaScript/JSON.tmLanguage')
+
+		v.run_command("insert_snippet", {"contents": templates.new_file})
diff --git a/templates.py b/templates.py
@@ -1,5 +1,5 @@
 
-scope_template = """<?xml version="1.0" encoding="UTF-8"?>
+scope = """<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
@@ -21,7 +21,16 @@
 </plist>
 """
 
-default_colours_template = """
+new_file = """{
+	"include": ["lightmarkdown"],
+	"autocompletion": false,
+	"patterns": {
+		$0"\\b(?hello)\\b": "dodgerblue",
+		"world": "#ff0000"
+	}
+}"""
+
+default_colours = """
 		<dict>
 			<key>settings</key>
 			<dict>
@@ -41,7 +50,7 @@
 		</dict>
 """
 
-theme_template = """<?xml version="1.0" encoding="UTF-8"?>
+theme = """<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
@@ -99,7 +108,7 @@
 		</dict>
 """
 
-default_settings_template = """
+default_settings = """
 {
 	"color_scheme": "Packages/Synesthesia/%s.tmTheme"
 }