Attachment 261811 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), 2.81 KB, created by Olivier Thomann

on 2016-05-17 16:43:38 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Olivier Thomann

Created: 2016-05-17 16:43:38 EDT

Size: 2.81 KB

patch

obsolete

>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..2b0078a 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 
>@@ -54,13 +54,21 @@ define("orion/editor/stylers/application_javascript/syntax", ["orion/editor/styl
> 				begin: "'(?:\\\\.|[^\\\\'])*\\\\$",
> 				end: "^(?:$|(?:\\\\.|[^\\\\'])*('|[^\\\\]$))",
> 				name: "string.quoted.single.js"
>-			}, {
>+			},
>+			{
> 				begin: '"(?:\\\\.|[^\\\\"])*\\\\$',
> 				end: '^(?:$|(?:\\\\.|[^\\\\"])*("|[^\\\\]$))',
> 				name: "string.quoted.double.js"
> 			},
>+			{
>+				begin: '"(?:\\\\.|[^\\\\`])*\\\\$',
>+				end: '^(?:$|(?:\\\\.|[^\\\\`])*(`|[^\\\\]$))',
>+				name: "string.quoted.backtick.js"
>+			},
> 			{include: "orion.lib#string_doubleQuote"},
> 			{include: "orion.lib#string_singleQuote"},
>+			{include: "orion.lib#string_backtickQuote"},
>+			
> 			{include: "orion.c-like#comment_singleLine"},
> 			{
> 				match: "/(?![\\s\\*])(?:\\\\.|[^/])+/(?:[gim]{0,3})",
>diff --git a/bundles/org.eclipse.orion.client.editor/web/orion/editor/stylers/lib/syntax.js b/bundles/org.eclipse.orion.client.editor/web/orion/editor/stylers/lib/syntax.js
>index 0dfcc23..84a0c93 100644
>--- a/bundles/org.eclipse.orion.client.editor/web/orion/editor/stylers/lib/syntax.js
>+++ b/bundles/org.eclipse.orion.client.editor/web/orion/editor/stylers/lib/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 
>@@ -81,6 +81,10 @@ define("orion/editor/stylers/lib/syntax", [], function() {
> 					match: "'(?:\\\\.|[^'])*'?",
> 					name: "string.quoted.single"
> 				},
>+				string_backtickQuote: {
>+					match: "`(?:\\\\.|[^`])*`?",
>+					name: "string.quoted.backtick"
>+				},
> 				todo_comment_singleLine: {
> 					match: "(\\b)(TODO)(\\b)(.*)",
> 					name: "meta.annotation.task.todo",

Actions: View | Diff

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