Attachment 240178 Details for Bug 428700 – patch to apply post-5.0

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

[patch] patch to apply post-5.0

phpFix.patch (text/plain), 5.29 KB, created by Grant Gayed

on 2014-02-20 19:47:45 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Grant Gayed

Created: 2014-02-20 19:47:45 EST

Size: 5.29 KB

patch

obsolete

>diff --git a/bundles/org.eclipse.orion.client.editor/web/orion/editor/stylers/text_html/syntax.js b/bundles/org.eclipse.orion.client.editor/web/orion/editor/stylers/text_html/syntax.js
>index 811d132..9292050 100644
>--- a/bundles/org.eclipse.orion.client.editor/web/orion/editor/stylers/text_html/syntax.js
>+++ b/bundles/org.eclipse.orion.client.editor/web/orion/editor/stylers/text_html/syntax.js
>@@ -46,42 +46,6 @@
> 						include: "orion.js"
> 					}
> 				]
>-			}, {
>-				begin: "(?i)<script\\s.*?(?:language\\s*=\\s*(['\"])php\\1|type\\s*=\\s*(['\"])text/x-php\\2).*?>",
>-				end: "(?i)</script>",
>-				captures: {
>-					0: {name: "entity.name.tag.html"}
>-				},
>-				contentName: "source.php.embedded.html",
>-				patterns: [
>-					{
>-						include: "orion.php"
>-					}
>-				]
>-			}, {
>-				begin: "(?i)<\\?(?:=|php)?(?:\\s|$)",
>-				end: "\\?>",
>-				captures: {
>-					0: {name: "entity.name.declaration.php"}
>-				},
>-				contentName: "source.php.embedded.html",
>-				patterns: [
>-					{
>-						include: "orion.php"
>-					}
>-				]
>-			}, {
>-				begin: "<%=?(?:\\s|$)",
>-				end: "%>",
>-				captures: {
>-					0: {name: "entity.name.declaration.php"}
>-				},
>-				contentName: "source.php.embedded.html",
>-				patterns: [
>-					{
>-						include: "orion.php"
>-					}
>-				]
> 			}
> 		],
> 		repository: {
>diff --git a/bundles/org.eclipse.orion.client.editor/web/orion/editor/stylers/text_x-php/syntax.js b/bundles/org.eclipse.orion.client.editor/web/orion/editor/stylers/text_x-php/syntax.js
>index 46f15d1..952fad3 100644
>--- a/bundles/org.eclipse.orion.client.editor/web/orion/editor/stylers/text_x-php/syntax.js
>+++ b/bundles/org.eclipse.orion.client.editor/web/orion/editor/stylers/text_x-php/syntax.js
>@@ -44,16 +44,39 @@
> 		contentTypes: ["text/x-php"],
> 		patterns: [
> 			{
>-				include: "orion.lib#doc_block"
>+				include: "orion.html"
> 			}, {
>-				include: "orion.c-like"
>-			}, {
>-				match: "(?i)<\\?(?:=|php)?(?:\\s|$)",
>-				name: "entity.name.declaration.php",
>-			}, {
>-				match: "<%=?(?:\\s|$)",
>-				name: "entity.name.declaration.php",
>-			}, {
>+				begin: "(?i)<(\\?|%(?!php))(?:=|php)?(?:\\s|$)",
>+				end: "[\\1]>",
>+				captures: {
>+					0: {name: "entity.name.declaration.php"}
>+				},
>+				contentName: "source.php.embedded",
>+				patterns: [
>+					{
>+						include: "orion.lib#doc_block"
>+					}, {
>+						include: "orion.c-like"
>+					}, {
>+						include: "#binary"
>+					}, {
>+						include: "#comment"
>+					}, {
>+						include: "#heredoc"
>+					}, {
>+						include: "#nowdoc"
>+					}, {
>+						include: "#keyword"
>+					}
>+				]
>+			}
>+		],
>+		repository: {
>+			binary: {
>+				match: "\\b0[bB][01]+\\b",
>+				name: "constant.numeric.binary.php"
>+			},
>+			comment: {
> 				match: "#.*",
> 				name: "comment.line.number-sign.php",
> 				patterns: [
>@@ -61,22 +84,22 @@
> 						include: "orion.lib#todo_comment_singleLine"
> 					}
> 				]
>-			}, {
>+			},
>+			heredoc: {
> 				begin: "<<<(\\w+)$",
> 				end: "^\\1;$",
> 				name: "string.unquoted.heredoc.php"
>-			}, {
>+			},
>+			nowdoc: {
> 				begin: "<<<'(\\w+)'$",
> 				end: "^\\1;$",
> 				name: "string.unquoted.heredoc.nowdoc.php"
>-			}, {
>-				match: "\\b0[bB][01]+\\b",
>-				name: "constant.numeric.binary.php"
>-			}, {
>+			},
>+			keyword: {
> 				match: "\\b(?:" + keywords.join("|") + ")\\b",
> 				name: "keyword.control.php"
> 			}
>-		]
>+		}
> 	});
> 
> 	return {
>diff --git a/bundles/org.eclipse.orion.client.editor/web/orion/editor/textStyler.js b/bundles/org.eclipse.orion.client.editor/web/orion/editor/textStyler.js
>index 1f8a433..5eadb28 100644
>--- a/bundles/org.eclipse.orion.client.editor/web/orion/editor/textStyler.js
>+++ b/bundles/org.eclipse.orion.client.editor/web/orion/editor/textStyler.js
>@@ -33,6 +33,7 @@
> 
> 	var eolRegex = /$/;
> 	var captureReferenceRegex = /\$\d)/g;
>+	var ignoreCaseRegex = /^\(\?i$\s*/;
> 	var linebreakRegex = /(.*)(?:[\r\n]|$)/g;
> 	var spacePattern = {regex: / /g, style: {styleClass: "punctuation separator space", unmergeable: true}}; //$NON-NLS-0$
> 	var tabPattern = {regex: /\t/g, style: {styleClass: "punctuation separator tab", unmergeable: true}}; //$NON-NLS-0$
>@@ -390,18 +391,19 @@
> 		getPatterns: function(pattern) {
> 			var parentId;
> 			if (!pattern) {
>-				parentId = this._rootId;
>+				parentId = this._rootId + "#" + this._NO_ID;
> 			} else {
> 				if (typeof(pattern) === "string") { //$NON-NLS-0$
> 					parentId = pattern;
> 				} else {
> 					parentId = pattern.qualifiedId;
> 				}
>+				parentId += "#";
> 			}
> 			/* indexes on patterns are used to break ties when multiple patterns match the same start text */
> 			var indexCounter = [0];
> 			var resultObject = {};
>-			var regEx = new RegExp("^" + parentId + "#[^#]+$"); //$NON-NLS-0$
>+			var regEx = new RegExp("^" + parentId + "[^#]+$"); //$NON-NLS-0$
> 			var includes = [];
> 			this._patterns.forEach(function(current) {
> 				if (regEx.test(current.qualifiedId)) {
>@@ -598,7 +600,7 @@
> 		_initPatterns: function() {
> 			var patterns = this.getPatternManager().getPatterns(this.pattern ? this.pattern.pattern : null);
> 			var processIgnore = function(matchString) {
>-				var result = /^$\?i$\s*/.exec(matchString);
>+				var result = ignoreCaseRegex.exec(matchString);
> 				if (result) {
> 					matchString = matchString.substring(result[0].length);
> 				}

Actions: View | Diff

Attachments on bug 428700: 240178 | 240205