Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
View | Details | Raw Unified | Return to bug 493848 | Differences between
and this patch

Collapse All | Expand All

(-)a/bundles/org.eclipse.orion.client.editor/web/orion/editor/stylers/application_javascript/syntax.js (-2 / +10 lines)
Lines 1-6 Link Here
1 
/*******************************************************************************
 1 
/*******************************************************************************
2 
 * @license
 2 
 * @license
3 
 * Copyright (c) 2014 IBM Corporation and others.
 3 
 * Copyright (c) 2014, 2016 IBM Corporation and others.
4 
 * All rights reserved. This program and the accompanying materials are made
4 
 * All rights reserved. This program and the accompanying materials are made
5 
 * available under the terms of the Eclipse Public License v1.0
5 
 * available under the terms of the Eclipse Public License v1.0
6 
 * (http://www.eclipse.org/legal/epl-v10.html), and the Eclipse Distribution
6 
 * (http://www.eclipse.org/legal/epl-v10.html), and the Eclipse Distribution
Lines 54-66 define("orion/editor/stylers/application_javascript/syntax", ["orion/editor/styl Link Here
54 
				begin: "'(?:\\\\.|[^\\\\'])*\\\\$",
 54 
				begin: "'(?:\\\\.|[^\\\\'])*\\\\$",
55 
				end: "^(?:$|(?:\\\\.|[^\\\\'])*('|[^\\\\]$))",
 55 
				end: "^(?:$|(?:\\\\.|[^\\\\'])*('|[^\\\\]$))",
56 
				name: "string.quoted.single.js"
 56 
				name: "string.quoted.single.js"
57 
			}, {
 57 
			},
58 
			{
58 
				begin: '"(?:\\\\.|[^\\\\"])*\\\\$',
 59 
				begin: '"(?:\\\\.|[^\\\\"])*\\\\$',
59 
				end: '^(?:$|(?:\\\\.|[^\\\\"])*("|[^\\\\]$))',
 60 
				end: '^(?:$|(?:\\\\.|[^\\\\"])*("|[^\\\\]$))',
60 
				name: "string.quoted.double.js"
 61 
				name: "string.quoted.double.js"
61 
			},
 62 
			},
63 
			{
64 
				begin: '"(?:\\\\.|[^\\\\`])*\\\\$',
65 
				end: '^(?:$|(?:\\\\.|[^\\\\`])*(`|[^\\\\]$))',
66 
				name: "string.quoted.backtick.js"
67 
			},
62 
			{include: "orion.lib#string_doubleQuote"},
 68 
			{include: "orion.lib#string_doubleQuote"},
63 
			{include: "orion.lib#string_singleQuote"},
 69 
			{include: "orion.lib#string_singleQuote"},
70 
			{include: "orion.lib#string_backtickQuote"},
71
64 
			{include: "orion.c-like#comment_singleLine"},
 72 
			{include: "orion.c-like#comment_singleLine"},
65 
			{
 73 
			{
66 
				match: "/(?![\\s\\*])(?:\\\\.|[^/])+/(?:[gim]{0,3})",
 74 
				match: "/(?![\\s\\*])(?:\\\\.|[^/])+/(?:[gim]{0,3})",
(-)a/bundles/org.eclipse.orion.client.editor/web/orion/editor/stylers/lib/syntax.js (-1 / +5 lines)
Lines 1-6 Link Here
1 
/*******************************************************************************
 1 
/*******************************************************************************
2 
 * @license
 2 
 * @license
3 
 * Copyright (c) 2014 IBM Corporation and others.
 3 
 * Copyright (c) 2014, 2016 IBM Corporation and others.
4 
 * All rights reserved. This program and the accompanying materials are made
4 
 * All rights reserved. This program and the accompanying materials are made
5 
 * available under the terms of the Eclipse Public License v1.0
5 
 * available under the terms of the Eclipse Public License v1.0
6 
 * (http://www.eclipse.org/legal/epl-v10.html), and the Eclipse Distribution
6 
 * (http://www.eclipse.org/legal/epl-v10.html), and the Eclipse Distribution
Lines 81-86 define("orion/editor/stylers/lib/syntax", [], function() { Link Here
81 
					match: "'(?:\\\\.|[^'])*'?",
 81 
					match: "'(?:\\\\.|[^'])*'?",
82 
					name: "string.quoted.single"
 82 
					name: "string.quoted.single"
83 
				},
 83 
				},
84 
				string_backtickQuote: {
85 
					match: "`(?:\\\\.|[^`])*`?",
86 
					name: "string.quoted.backtick"
87 
				},
84 
				todo_comment_singleLine: {
 88 
				todo_comment_singleLine: {
85 
					match: "(\\b)(TODO)(\\b)(.*)",
 89 
					match: "(\\b)(TODO)(\\b)(.*)",
86 
					name: "meta.annotation.task.todo",
 90 
					name: "meta.annotation.task.todo",

Return to bug 493848