Merge branch 'master' of https://github.com/wbond/package_control_channel

.editorconfig

+# editorconfig.org
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+ident_size = 4
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.json]
+indent_style = tab
+
+[*.py]
+ident_style = space

repository/a.json

@@ -1830,6 +1830,17 @@
 				}
 			]
 		},
+		{
+			"name": "Atlantis VIP Language",
+			"details": "https://github.com/dziaineka/Atlantis-VIP-sublime",
+			"labels": ["Atlantis", "VIP", "language syntax", "snippets", "galaktika"],
+			"releases": [
+				{
+					"sublime_text": ">=3092",
+					"tags": true
+				}
+			]
+		},
 		{
 			"name": "Atomic Color Scheme",
 			"details": "https://github.com/gerardbm/Sublime-Atomic-Scheme",

repository/b.json

@@ -515,6 +515,19 @@
 				}
 			]
 		},
+		{
+			"name": "Better OCaml",
+			"details": "https://github.com/whitequark/sublime-better-ocaml",
+			"description": "An improved version of default OCaml package",
+			"labels": ["language syntax"],
+			"previous_names": ["OCaml"],
+			"releases": [
+				{
+					"sublime_text": ">=3000",
+					"branch": "master"
+				}
+			]
+		},
 		{
 			"name": "Better RSpec",
 			"details": "https://github.com/fnando/better-rspec-for-sublime-text",

repository/j.json

@@ -666,6 +666,17 @@
 				}
 			]
 		},
+		{
+			"name": "JQ Syntax",
+			"details": "https://github.com/zogwarg/SublimeJQ",
+			"labels": ["language syntax", "jq", "stedolan"],
+			"releases": [
+				{
+					"sublime_text": ">=3092",
+					"tags": true
+				}
+			]
+		},
 		{
 			"details": "https://github.com/SublimeText/jQuery",
 			"releases": [

repository/l.json

@@ -219,6 +219,16 @@
 				}
 			]
 		},
+		{
+			"name": "Laravel Docs",
+			"details": "https://github.com/austenc/sublime-laravel-docs",
+			"releases": [
+				{
+					"sublime_text": "*",
+					"tags": true
+				}
+			]
+		},
 		{
 			"name": "Laravel Forms Bootstrap Snippets",
 			"details": "https://github.com/redgluten/laravel_forms_boostrap_snippets",

repository/n.json

@@ -741,8 +741,12 @@
 			"labels": ["color scheme", "notepad++"],
 			"releases": [
 				{
-					"sublime_text": ">=3114",
+					"sublime_text": ">3144",
 					"tags": true
+				},
+				{
+					"sublime_text": "<=3144",
+					"tags": "build3144support-"
 				}
 			]
 		},

repository/o.json

@@ -66,18 +66,6 @@
 				}
 			]
 		},
-		{
-			"name": "OCaml",
-			"details": "https://github.com/whitequark/sublime-better-ocaml",
-			"description": "An improved version of default OCaml package",
-			"labels": ["language syntax"],
-			"releases": [
-				{
-					"sublime_text": ">=3000",
-					"branch": "master"
-				}
-			]
-		},
 		{
 			"name": "OCaml Autocompletion",
 			"details": "https://github.com/whitequark/sublime-ocp-index",

repository/r.json

@@ -239,6 +239,16 @@
 				}
 			]
 		},
+		{
+			"name": "Rainglow",
+			"details": "https://github.com/daylerees/rainglow",
+			"releases": [
+				{
+					"sublime_text": "*",
+					"tags": true
+				}
+			]
+		},
 		{
 			"name": "Rainmeter",
 			"details": "https://github.com/thatsIch/sublime-rainmeter",
@@ -334,6 +344,16 @@
 				}
 			]
 		},
+		{
+			"name": "RandomCase",
+			"details": "https://github.com/dcowsill/randomcase",
+			"releases": [
+				{
+					"sublime_text": ">=3000",
+					"tags": true
+				}
+			]
+		},
 		{
 			"details": "https://github.com/marclar/RandomizeLogMessages",
 			"releases": [
@@ -601,6 +621,16 @@
 				}
 			]
 		},
+		{
+			"name": "ReadonlyMode",
+			"details": "https://github.com/dongliu/sublime-readonly",
+			"releases": [
+				{
+					"sublime_text": "*",
+					"tags": true
+				}
+			]
+		},
 		{
 			"name": "ReadonlyProtect",
 			"details": "https://github.com/ivellioscolin/sublime-plugin-readonlyprotect",

repository/s.json

@@ -702,9 +702,10 @@
 			]
 		},
 		{
-			"name": "Se7en",
+			"name": "Se7en Color Schemes",
 			"details": "https://github.com/csknklc/se7en",
 			"labels": ["color scheme"],
+			"previous_names": ["Se7en"],
 			"releases": [
 				{
 					"sublime_text": "*",
@@ -1883,6 +1884,19 @@
 				}
 			]
 		},
+		{
+			"name": "SimpleSyntax",
+			"details": "https://github.com/budRich/SimpleSyntax",
+			"description": "Comment syntax for config files",
+			"author": "Nils Kvist",
+			"labels": ["configfile", "syntax"],
+			"releases": [
+				{
+					"sublime_text": "*",
+					"tags": true
+				}
+			]
+		},
 		{
 			"name": "SimpleTesting",
 			"details": "https://github.com/coretick/SimpleTestingSublime",
@@ -2186,6 +2200,16 @@
 				}
 			]
 		},
+		{
+			"name": "Smart Indent",
+			"details": "https://github.com/YKZDY/SmartIndent-sublime",
+			"releases": [
+				{
+					"sublime_text": "*",
+					"tags": true
+				}
+			]
+		},
 		{
 			"name": "Smart Match",
 			"details": "https://github.com/ccampbell/sublime-smart-match",

repository/t.json

@@ -848,6 +848,19 @@
 				}
 			]
 		},
+		{
+			"name": "Theme - City Lights",
+			"details": "https://github.com/Yummygum/city-lights-sublime",
+			"homepage": "http://citylights.xyz/",
+			"labels": ["theme", "color scheme", "City Lights", "syntax"],
+			"author": "Yummygum",
+			"releases": [
+				{
+					"sublime_text": "*",
+					"tags": true
+				}
+			]
+		},
 		{
 			"name": "Theme - Cobalt2",
 			"details": "https://github.com/wesbos/cobalt2",
@@ -2170,26 +2183,26 @@
 			]
 		},
 		{
-			"name": "Tmux Syntax Highlight",
-			"previous_names": ["Tmux"],
-			"details": "https://github.com/keqh/sublime-tmux-syntax-highlight",
-			"labels": ["language syntax"],
+			"name": "tmux",
+			"previous_names": ["tmux_open"],
+			"details": "https://github.com/huntie/sublime-tmux",
+			"labels": ["tmux", "terminal"],
 			"releases": [
 				{
-					"sublime_text": "*",
-					"branch": "master"
+					"sublime_text": ">=3000",
+					"platforms": ["linux", "osx"],
+					"tags": true
 				}
 			]
 		},
 		{
-			"name": "tmux_open",
-			"details": "https://github.com/huntie/sublime-tmux",
-			"labels": ["tmux", "terminal"],
+			"name": "Tmux Syntax Highlight",
+			"details": "https://github.com/keqh/sublime-tmux-syntax-highlight",
+			"labels": ["language syntax"],
 			"releases": [
 				{
-					"sublime_text": ">=3000",
-					"platforms": ["linux", "osx"],
-					"tags": true
+					"sublime_text": "*",
+					"branch": "master"
 				}
 			]
 		},

repository/u.json

@@ -197,6 +197,18 @@
 				}
 			]
 		},
+		{
+			"name": "UnicodeNormalizer",
+			"details": "https://github.com/gh640/SublimeUnicodeNormalizer",
+			"author": "Goto Hayato",
+			"labels": ["text manipulation", "unicode", "utf8"],
+			"releases": [
+				{
+					"sublime_text": ">=3000",
+					"tags": true
+				}
+			]
+		},
 		{
 			"name": "UnicodeTeX",
 			"details": "https://github.com/neilanderson/UnicodeTeX",

repository/v.json

@@ -662,8 +662,12 @@
 			"details": "https://github.com/vuejs/vue-syntax-highlight",
 			"releases": [
 				{
-					"sublime_text": "*",
-					"tags": true
+					"sublime_text": "<3153",
+					"tags": "oldsyntax-"
+				},
+				{
+					"sublime_text": ">=3153",
+					"tags": "newsyntax-"
 				}
 			]
 		},

tests/test.py

@@ -168,6 +168,20 @@ class TestContainer(object):
         # tuple of (prev_name, include, name); prev_name for case sensitivity
         cls.previous_package_names = CaseInsensitiveDict()
 
+    # Default packages for ST2 and ST3 are largely the same,
+    # except for Pascal and Rust
+    # which only ship in ST3
+    default_packages = (
+        'ActionScript', 'AppleScript', 'ASP', 'Batch File',
+        'C#', 'C++', 'Clojure', 'Color Scheme - Default', 'CSS', 'D', 'Default',
+        'Diff', 'Erlang', 'Go', 'Graphviz', 'Groovy', 'Haskell', 'HTML', 'Java',
+        'JavaScript', 'Language - English', 'LaTeX', 'Lisp', 'Lua', 'Makefile',
+        'Markdown', 'Matlab', 'Objective-C', 'OCaml', 'Pascal', 'Perl', 'PHP',
+        'Python', 'R', 'Rails', 'Regular Expressions', 'RestructuredText',
+        'Ruby', 'Rust', 'Scala', 'ShellScript', 'SQL', 'TCL', 'Text', 'Textile',
+        'Theme - Default', 'Vintage', 'XML', 'YAML'
+    )
+
     rel_b_reg = r'''^ (https:// github\.com/ [^/]+/ [^/]+
                       |https:// bitbucket\.org/ [^/]+/ [^/]+
                       ) $'''
@@ -341,6 +355,8 @@ class TestContainer(object):
         self.assertFalse(name.startswith('.'), 'Package names may not start '
                                                'with a dot')
 
+        self.assertNotIn(name, self.default_packages)
+
         if 'details' not in data:
             for key in ('name', 'homepage', 'author', 'releases'):
                 self.assertIn(key, data, '%r is required if no "details" URL '