Attachment 261828 Details for Bug 493848 – Proposed patch

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] Proposed patch

493848.patch (text/plain), 3.43 KB, created by Olivier Thomann

on 2016-05-18 11:01:04 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Olivier Thomann

Created: 2016-05-18 11:01:04 EDT

Size: 3.43 KB

patch

obsolete

>diff --git a/bundles/org.eclipse.orion.client.editor/web/js-tests/editor/textStyler/js/styles.txt b/bundles/org.eclipse.orion.client.editor/web/js-tests/editor/textStyler/js/styles.txt
>index 2cfd9fd..a1e35ad 100644
>--- a/bundles/org.eclipse.orion.client.editor/web/js-tests/editor/textStyler/js/styles.txt
>+++ b/bundles/org.eclipse.orion.client.editor/web/js-tests/editor/textStyler/js/styles.txt
>@@ -1156,7 +1156,7 @@
> {"start":12259,"end":12261,"style":{"styleClass":"string quoted double"}}
> {"start":12263,"end":12276,"style":{"styleClass":"comment line double-slash"}}
> {"start":12303,"end":12304,"style":{"styleClass":"punctuation operator"}}
>-{"start":12305,"end":12307,"style":{"styleClass":"string quoted double"}}
>+{"start":12305,"end":12307,"style":{"styleClass":"string quoted backtick js"}}
> {"start":12309,"end":12322,"style":{"styleClass":"comment line double-slash"}}
> {"start":12327,"end":12328,"style":{"styleClass":"punctuation section block end"}}
> {"start":12332,"end":12333,"style":{"styleClass":"punctuation section block end"}}
>diff --git a/bundles/org.eclipse.orion.client.editor/web/js-tests/editor/textStyler/js/text.txt b/bundles/org.eclipse.orion.client.editor/web/js-tests/editor/textStyler/js/text.txt
>index 7cd5e07..60e2033 100644
>--- a/bundles/org.eclipse.orion.client.editor/web/js-tests/editor/textStyler/js/text.txt
>+++ b/bundles/org.eclipse.orion.client.editor/web/js-tests/editor/textStyler/js/text.txt
>@@ -1,6 +1,6 @@
> /*******************************************************************************
>  * @license
>- * Copyright (c) 2010, 2015 IBM Corporation and others.
>+ * Copyright (c) 2010, 2016 IBM Corporation and others.
>  * All rights reserved. This program and the accompanying materials are made 
>  * available under the terms of the Eclipse Public License v1.0 
>  * (http://www.eclipse.org/legal/epl-v10.html), and the Eclipse Distribution 
>@@ -383,7 +383,7 @@ define("orion/editor/textView", [  //$NON-NLS-0$
> 					viewDiv.style.zIndex = "2"; //$NON-NLS-0$
> 				} else {
> 					viewDiv.style.pointerEvents = ""; //$NON-NLS-0$
>-					viewDiv.style.zIndex = ""; //$NON-NLS-0$
>+					viewDiv.style.zIndex = ``; //$NON-NLS-0$
> 				}
> 			}
> 			if (!init) {
>diff --git a/bundles/org.eclipse.orion.client.editor/web/orion/editor/stylers/application_javascript/syntax.js b/bundles/org.eclipse.orion.client.editor/web/orion/editor/stylers/application_javascript/syntax.js
>index 329c73a..d38c909 100644
>--- a/bundles/org.eclipse.orion.client.editor/web/orion/editor/stylers/application_javascript/syntax.js
>+++ b/bundles/org.eclipse.orion.client.editor/web/orion/editor/stylers/application_javascript/syntax.js
>@@ -1,6 +1,6 @@
> /*******************************************************************************
>  * @license
>- * Copyright (c) 2014 IBM Corporation and others.
>+ * Copyright (c) 2014, 2016 IBM Corporation and others.
>  * All rights reserved. This program and the accompanying materials are made 
>  * available under the terms of the Eclipse Public License v1.0 
>  * (http://www.eclipse.org/legal/epl-v10.html), and the Eclipse Distribution 
>@@ -59,6 +59,10 @@ define("orion/editor/stylers/application_javascript/syntax", ["orion/editor/styl
> 				end: '^(?:$|(?:\\\\.|[^\\\\"])*("|[^\\\\]$))',
> 				name: "string.quoted.double.js"
> 			},
>+			{
>+				match: '`(?:\\\\.|[^`])*`?',
>+				name: "string.quoted.backtick.js"
>+			},
> 			{include: "orion.lib#string_doubleQuote"},
> 			{include: "orion.lib#string_singleQuote"},
> 			{include: "orion.c-like#comment_singleLine"},

Actions: View | Diff

Attachments on bug 493848: 261810 | 261811 | 261812 | 261828