TextMate as one word. Fixes microsoft#29058

aeschli · aeschli · commit c05c85b45f19 · 2017-08-10T18:03:45.000+02:00
diff --git a/extensions/swift/LICENSE.md b/extensions/swift/LICENSE.md
@@ -22,7 +22,7 @@ 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.
 
-Text mate grammar:
+TextMate grammar:
 
 Copyright (c) 2014 Darin Morrison
 
diff --git a/src/vs/workbench/services/themes/electron-browser/colorThemeData.ts b/src/vs/workbench/services/themes/electron-browser/colorThemeData.ts
@@ -271,7 +271,7 @@ function _loadColorThemeFromFile(themePath: string, resultRules: ITokenColorizat
 					} else if (typeof tokenColors === 'string') {
 						return _loadSyntaxTokensFromFile(Paths.join(Paths.dirname(themePath), tokenColors), resultRules, {});
 					} else {
-						return TPromise.wrapError(new Error(nls.localize({ key: 'error.invalidformat.tokenColors', comment: ['{0} will be replaced by a path. Values in quotes should not be translated.'] }, "Problem parsing color theme file: {0}. Property 'tokenColors' should be either an array specifying colors or a path to a text mate theme file", themePath)));
+						return TPromise.wrapError(new Error(nls.localize({ key: 'error.invalidformat.tokenColors', comment: ['{0} will be replaced by a path. Values in quotes should not be translated.'] }, "Problem parsing color theme file: {0}. Property 'tokenColors' should be either an array specifying colors or a path to a TextMate theme file", themePath)));
 					}
 				}
 				return null;

Original file line number	Diff line number	Diff line change
`@@ -271,7 +271,7 @@ function _loadColorThemeFromFile(themePath: string, resultRules: ITokenColorizat`
`271`	`271`	`} else if (typeof tokenColors === 'string') {`
`272`	`272`	`return _loadSyntaxTokensFromFile(Paths.join(Paths.dirname(themePath), tokenColors), resultRules, {});`
`273`	`273`	`} else {`
`274`		`- return TPromise.wrapError(new Error(nls.localize({ key: 'error.invalidformat.tokenColors', comment: ['{0} will be replaced by a path. Values in quotes should not be translated.'] }, "Problem parsing color theme file: {0}. Property 'tokenColors' should be either an array specifying colors or a path to a text mate theme file", themePath)));`
	`274`	`+ return TPromise.wrapError(new Error(nls.localize({ key: 'error.invalidformat.tokenColors', comment: ['{0} will be replaced by a path. Values in quotes should not be translated.'] }, "Problem parsing color theme file: {0}. Property 'tokenColors' should be either an array specifying colors or a path to a TextMate theme file", themePath)));`
`275`	`275`	`}`
`276`	`276`	`}`
`277`	`277`	`return null;`