Merge pull request #4 from MinecraftCommands/5uso/main

Reorder comments within root

Author: Rit

mcfunction.tmLanguage

@@ -26,7 +26,7 @@
 					<key>applyEndPatternLast</key>
 					<integer>1</integer>
 					<key>begin</key>
-					<string>^\s*(#[&gt;!])(.+)$</string>
+					<string>^\s*(#[&gt;!#])(.+)$</string>
 					<key>beginCaptures</key>
 					<dict>
 						<key>1</key>
@@ -70,7 +70,7 @@
 						</dict>
 					</dict>
 					<key>match</key>
-					<string>#.*$</string>
+					<string>^\s*#.*$</string>
 					<key>name</key>
 					<string>meta.comments</string>
 				</dict>
@@ -222,6 +222,26 @@
 				</dict>
 			</array>
 		</dict>
+		<key>comments_inline</key>
+		<dict>
+			<key>patterns</key>
+			<array>
+				<dict>
+					<key>captures</key>
+					<dict>
+						<key>0</key>
+						<dict>
+							<key>name</key>
+							<string>comment.line.mcfunction</string>
+						</dict>
+					</dict>
+					<key>match</key>
+					<string>#.*$</string>
+					<key>name</key>
+					<string>meta.comments</string>
+				</dict>
+			</array>
+		</dict>
 		<key>literals</key>
 		<dict>
 			<key>patterns</key>
@@ -799,7 +819,7 @@
 						</dict>
 					</dict>
 					<key>match</key>
-					<string>[A-Za-z_\-\+]+</string>
+					<string>[A-Za-z_]+[A-Za-z_\-\+]*</string>
 					<key>name</key>
 					<string>meta.property_key</string>
 				</dict>
@@ -881,13 +901,17 @@
 					<key>include</key>
 					<string>#literals</string>
 				</dict>
+				<dict>
+					<key>include</key>
+					<string>#comments</string>
+				</dict>
 				<dict>
 					<key>include</key>
 					<string>#names</string>
 				</dict>
 				<dict>
 					<key>include</key>
-					<string>#comments</string>
+					<string>#comments_inline</string>
 				</dict>
 				<dict>
 					<key>include</key>

mcfunction.tmLanguage.json

@@ -17,11 +17,14 @@
         {
           "include": "#literals"
         },
+        {
+          "include": "#comments"
+        },
         {
           "include": "#names"
         },
         {
-          "include": "#comments"
+          "include": "#comments_inline"
         },
         {
           "include": "#subcommands"
@@ -41,7 +44,7 @@
       "patterns": [
         {
           "applyEndPatternLast": 1,
-          "begin": "^\\s*(#[>!])(.+)$",
+          "begin": "^\\s*(#[>!#])(.+)$",
           "beginCaptures": {
             "1": {
               "name": "comment.block.mcfunction"
@@ -63,6 +66,19 @@
             }
           ]
         },
+        {
+          "captures": {
+            "0": {
+              "name": "comment.line.mcfunction"
+            }
+          },
+          "match": "^\\s*#.*$",
+          "name": "meta.comments"
+        }
+      ]
+    },
+    "comments_inline": {
+      "patterns": [
         {
           "captures": {
             "0": {