Improve auto-complete

LICENSE.md

@@ -1,4 +1,4 @@
-Copyright (c) 2017 MrYurihi Redstone
+Copyright (c) 2019 Czaplicki
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

ORIGINAL_LICENSE.md

@@ -0,0 +1,20 @@
+Copyright (c) 2017 MrYurihi Redstone
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

README.md

@@ -1,6 +1,28 @@
-# mcfunction package
+# mcfunction-support for Atom
 
-A syntax highlighter and snippet package for Minecraft's function files
-![image not loading](https://mryurihi.github.io/atom-mcfunction-image.png)
+# CONTRIBUTE
+I have stoped using atom as my text editor,
+so I'm not as inclined to continue working on this extention.
+I will do my best with look at the pull requests,
+but if anyone would what to take over the repository,
+it would be highly appriciated!
 
-It also has a *very* competent autocomplete+ provider that is almost identical to Minecraft's native tab completions, so you fill feel right at home
+A syntax highlighter, auto-complete provider and snippet package for Minecraft 1.15
+function files, built for the [Atom editor](https://atom.io/). The autocomplete
+provider is *very* competent and almost has an identical feel to Minecraft's native
+tab completions.
+
+## Info
+This is a fork of https://github.com/MrYurihi/mcfunction.
+I have no idea how he made this, but adding and removing entries in a JSON file,
+I do know how to do, so I updated it to 1.15. All Credit goes to them.
+
+If you find something missing, a command, command option, id, etc.
+Leave it as en issue or feel free to add them your self and do a pull request,
+over at : https://github.com/Czaplicki/mcfunction-support-resources/
+
+
+## IMO
+This is the best available package on apm for datapacks in 1.15.
+This is *not* the best available package on apm for datapacks in 1.13.  
+For 1.13, use https://github.com/MrYurihi/mcfunction.

grammars/mcfunction.json

@@ -1,15 +1,16 @@
 {
 	"scopeName": "source.mcfunction",
 	"name": "mcfunction",
-	"fileTypes": [""],
+	"fileTypes": ["mcfunction"],
 	"patterns": [
-		{
-			"match": "@[parse]",
-			"name": "selector"
-		},
 		{
 			"name": "argument",
-			"begin": "\\[",
+			"begin": "(@[parse])\\[",
+			"beginCaptures": {
+				"1": {
+					"name": "selector"
+				}
+			},
 			"end": "\\]",
 			"patterns": [
 				{
@@ -25,31 +26,72 @@
 					"end": "(?=,|\\])",
 					"name": "value",
 					"patterns": [
+						{
+							"begin": "\"",
+							"end": "\"",
+							"patterns": [
+								{
+									"match": "\\\\(?:[\"\\\\/bfnrt])|(?:u[0-9a-fA-F]{4})"
+								}
+							]
+						},
 						{
 							"match": "[\\w_]"
+						},
+						{
+							"include": "#nbt-compound"
 						}
 					]
 				}
 			]
 		},
+		{
+			"match": "@[parse]",
+			"name": "selector"
+		},
 		{
 			"include": "#nbt-compound"
 		},
 		{
-			"match": "^(?:advancement|blockdata|clear|clone|defaultgamemode|difficulty|effect|enchant|entitydata|execute|fill|function|gamemode|gamerule|give|kill|locate|particle|playsound|recipe|reload|replaceitem|say|scoreboard|setblock|setworldspawn|spreadplayers|stats|stopsound|summon|teleport|tellraw|tell|testforblocks|testforblock|testfor|time|title|toggledownfall|tp|trigger|weather|worldborder|xp)\\b",
+			"match": "(?:^|(?<=run ))(?:advancement|clear|clone|data|datapack|defaultgamemode|difficulty|effect|execute|experience|fill|forceload|function|gamemode|gamerule|give|kill|locate|msg|particle|playsound|recipe|reload|replaceitem|say|scoreboard|tag|team|seed|setblock|setworldspawn|schedule|spreadplayers|stopsound|summon|teleport|tellraw|tell|time|title|tp|trigger|w|weather|worldborder|xp)\\b",
 			"name": "command"
 		},
 		{
 			"match": "^#.*",
 			"name": "comment"
 		},
 		{
-			"match": "(?: (?:~-?(?:\\d*\\.)?\\d*|-?(?:\\d*\\.)?\\d+)){3}",
+			"match": "(:?[~^] ?|[~^]?\\-?\\d*\\.?\\d+\\ ?){2,5}",
 			"name": "coord"
 		},
 		{
 			"match": "^/",
-			"name": "invalid.illegal.error.fslash"
+			"name": "error.fslash"
+		},
+		{
+			"match": "\\[(?:(?:(\\w+)=(\\w+)),)*(?:(\\w+)=(\\w+))\\]",
+			"name": "state",
+			"captures": {
+				"1": {
+					"name": "name"
+				},
+				"3": {
+					"name": "name"
+				},
+				"2": {
+					"name": "value"
+				},
+				"4": {
+					"name": "value"
+				}
+			}
+		},
+		{
+			"match" : "\\.\\.\\d+|\\d+\\.\\.\\d+|\\d+\\.\\.|\\d+",
+			"name" : "range"
+		},
+		{
+			"include": "source.json"
 		}
 	],
 	"repository": {
@@ -97,7 +139,7 @@
 		},
 		"nbt-key-unquoted": {
 			"match": "[\\w_]+",
-			"name": "key.nbt"
+			"name": "key"
 		},
 		"nbt-value": {
 			"patterns": [

grammars/mcmeta.json

@@ -0,0 +1,10 @@
+{
+	"scopeName": "source.mcmeta",
+	"name": "mcmeta",
+	"fileTypes": ["mcmeta"],
+	"patterns" : [
+		{
+			"include" : "source.json"
+		}
+	]
+}