Attachment 257761 Details for Bug 480771 – workaround

[patch] workaround

changes (26).patch (text/plain), 3.68 KB, created by Silenio Quarti

on 2015-11-05 13:00:57 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Silenio Quarti

Created: 2015-11-05 13:00:57 EST

Size: 3.68 KB

patch

obsolete

>diff --git a/bundles/org.eclipse.orion.client.javascript/web/javascript/commands/refsCommand.js b/bundles/org.eclipse.orion.client.javascript/web/javascript/commands/refsCommand.js
>index a32ef48..53e1a45b 100644
>--- a/bundles/org.eclipse.orion.client.javascript/web/javascript/commands/refsCommand.js
>+++ b/bundles/org.eclipse.orion.client.javascript/web/javascript/commands/refsCommand.js
>@@ -194,7 +194,7 @@
> 												var match = line.matches[j];
> 												var v = Finder.findWord(line.name, match.startIndex);
> 												if(v === node.name) {
>-													that._checkType(type, file.metadata, match, expected);
>+													that._checkType(type, file.metadata, file.contents ? file.contents.join("") : undefined, match, expected);
> 												} else {
> 													match.category = categories.partial.category;
> 													match.confidence = 0;
>@@ -225,10 +225,10 @@
> 		 * @function
> 		 * @private
> 		 */
>-		_checkType: function _checkType(original, file, match, expected) {
>+		_checkType: function _checkType(original, file, contents, match, expected) {
> 			var that = this;
> 			that.ternworker.postMessage(
>-					{request: 'checkRef', args: {meta:{location: file.Location}, params: {offset: match.end}, origin: original}},  //$NON-NLS-1$
>+					{request: 'checkRef', args: {meta:{location: file.Location}, source: contents, params: {offset: match.end}, origin: original}},  //$NON-NLS-1$
> 					/* @callback */ function(type, err) {
> 						if(type && type.type) {
> 							var _t = type.type, _ot = original.type;
>diff --git a/bundles/org.eclipse.orion.client.javascript/web/javascript/plugins/ternWorkerCore.js b/bundles/org.eclipse.orion.client.javascript/web/javascript/plugins/ternWorkerCore.js
>index f06e182..6979aa5 100644
>--- a/bundles/org.eclipse.orion.client.javascript/web/javascript/plugins/ternWorkerCore.js
>+++ b/bundles/org.eclipse.orion.client.javascript/web/javascript/plugins/ternWorkerCore.js
>@@ -482,6 +482,7 @@
> 		           query: {
> 			           type: "checkRef",  //$NON-NLS-1$
> 			           file: args.meta.location,
>+			           source: args.source,
> 			           end: args.params.offset,
> 			           origin: args.origin
> 		           }},
>diff --git a/bundles/org.eclipse.orion.client.javascript/web/tern/plugin/refs.js b/bundles/org.eclipse.orion.client.javascript/web/tern/plugin/refs.js
>index a2d6ee2..ae31927 100644
>--- a/bundles/org.eclipse.orion.client.javascript/web/tern/plugin/refs.js
>+++ b/bundles/org.eclipse.orion.client.javascript/web/tern/plugin/refs.js
>@@ -37,20 +37,27 @@
> 		runAsync: function runAsync(server, query, serverFile, f) {
> 			var file = tern.resolveFile(server, server.fileMap, query.file);
> 			if(!file) {
>-				server.addFile(query.file);
>-				pending[query.file] = {
>-					callback: f,
>-					query: query
>-				};
>-				server.on("afterLoad", function(file) { //$NON-NLS-1$
>-					if(file && file.name) {
>-						var p = pending[file.name];
>-						if(p) {
>-							delete pending[file.name];
>-							doCheck(p.query, file, server, p.callback);
>-						}	
>-					}
>-				}.bind(server));
>+				server.addFile(query.file, query.source);
>+				if (query.source) {
>+					file = tern.resolveFile(server, server.fileMap, query.file);
>+					doCheck(query, file, server, f);
>+				} else {
>+					pending[query.file] = {
>+						callback: f,
>+						query: query
>+					};
>+					var afterLoad = function(file) { //$NON-NLS-1$
>+						server.off("afterLoad", afterLoad);
>+						if(file && file.name) {
>+							var p = pending[file.name];
>+							if(p) {
>+								delete pending[file.name];
>+								doCheck(p.query, file, server, p.callback);
>+							}	
>+						}
>+					}.bind(server);
>+					server.on("afterLoad", afterLoad);
>+				}
> 			} else {
> 				doCheck(query, file, server, f);
> 			}

Actions: View | Diff

Attachments on bug 480771: 257761