https-githubsup-com
diff --git a/‎build/npm/update-grammar.js‎
Lines changed: 5 additions & 3 deletions b/‎build/npm/update-grammar.js‎
Lines changed: 5 additions & 3 deletions
diff --git a/‎extensions/r/OSSREADME.json‎
Lines changed: 3 additions & 13 deletions b/‎extensions/r/OSSREADME.json‎
Lines changed: 3 additions & 13 deletions
diff --git a/‎extensions/r/package.json‎
Lines changed: 1 addition & 1 deletion b/‎extensions/r/package.json‎
Lines changed: 1 addition & 1 deletion
@@ -22,7 +22,7 @@ function getOptions(urlString) {
 		headers: {
 			'User-Agent': 'NodeJS'
 		}
-	}
+	};
 }
 
 function download(url, redirectCount) {
@@ -100,7 +100,9 @@ exports.update = function (repoId, repoPath, dest, modifyGrammar) {
 				result.version = 'https://github.com/' + repoId + '/commit/' + info.commitSha;
 			}
 			for (let key in grammar) {
-				result[key] = grammar[key];
+				if (!result.hasOwnProperty(key)) {
+					result[key] = grammar[key];
+				}
 			}
 
 			try {
@@ -116,7 +118,7 @@ exports.update = function (repoId, repoPath, dest, modifyGrammar) {
 		});
 
 	}, console.error);
-}
+};
 
 if (path.basename(process.argv[1]) === 'update-grammar.js') {
 	for (var i = 3; i < process.argv.length; i += 2) {
 
@@ -1,17 +1,7 @@
 // ATTENTION - THIS DIRECTORY CONTAINS THIRD PARTY OPEN SOURCE MATERIALS:
 [{
-	"name": "textmate/r.tmbundle",
+	"name": "Ikuyadeu/vscode-R",
 	"version": "0.0.0",
-	"license": "TextMate Bundle License",
-	"repositoryURL": "https://github.com/textmate/r.tmbundle",
-	"licenseDetail": [
-		"Copyright (c) textmate-r.tmbundle project authors",
-		"",
-		"If not otherwise specified (see below), files in this folder fall under the following license: ",
-		"",
-		"Permission to copy, use, modify, sell and distribute this",
-		"software is granted. This software is provided \"as is\" without",
-		"express or implied warranty, and with no claim as to its",
-		"suitability for any purpose."
-	]
+	"license": "MIT",
+	"repositoryURL": "https://github.com/Ikuyadeu/vscode-R"
 }]
@@ -4,7 +4,7 @@
 	"publisher": "vscode",
 	"engines": { "vscode": "*" },
 	"scripts": {
-		"update-grammar": "node ../../build/npm/update-grammar.js textmate/r.tmbundle Syntaxes/R.plist ./syntaxes/r.tmLanguage.json"
+		"update-grammar": "node ../../build/npm/update-grammar.js Ikuyadeu/vscode-R syntax/r.json ./syntaxes/r.tmLanguage.json"
 	},
 	"contributes": {
 		"languages": [{
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ function getOptions(urlString) {`
`22`	`22`	`headers: {`
`23`	`23`	`'User-Agent': 'NodeJS'`
`24`	`24`	`}`
`25`		`- }`
	`25`	`+ };`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`function download(url, redirectCount) {`
`@@ -100,7 +100,9 @@ exports.update = function (repoId, repoPath, dest, modifyGrammar) {`
`100`	`100`	`result.version = 'https://github.com/' + repoId + '/commit/' + info.commitSha;`
`101`	`101`	`}`
`102`	`102`	`for (let key in grammar) {`
`103`		`- result[key] = grammar[key];`
	`103`	`+ if (!result.hasOwnProperty(key)) {`
	`104`	`+ result[key] = grammar[key];`
	`105`	`+ }`
`104`	`106`	`}`
`105`	`107`
`106`	`108`	`try {`
`@@ -116,7 +118,7 @@ exports.update = function (repoId, repoPath, dest, modifyGrammar) {`
`116`	`118`	`});`
`117`	`119`
`118`	`120`	`}, console.error);`
`119`		`-}`
	`121`	`+};`
`120`	`122`
`121`	`123`	`if (path.basename(process.argv[1]) === 'update-grammar.js') {`
`122`	`124`	`for (var i = 3; i < process.argv.length; i += 2) {`