Attachment 261382 Details for Bug 492688 – Proposed patch

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

[patch] Proposed patch

492688.patch (text/plain), 5.55 KB, created by Olivier Thomann

on 2016-04-29 15:56:32 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Olivier Thomann

Created: 2016-04-29 15:56:32 EDT

Size: 5.55 KB

patch

obsolete

>diff --git a/bundles/org.eclipse.orion.client.javascript/web/javascript/plugins/javascriptPlugin.js b/bundles/org.eclipse.orion.client.javascript/web/javascript/plugins/javascriptPlugin.js
>index 8a6d440..9b879bf 100644
>--- a/bundles/org.eclipse.orion.client.javascript/web/javascript/plugins/javascriptPlugin.js
>+++ b/bundles/org.eclipse.orion.client.javascript/web/javascript/plugins/javascriptPlugin.js
>@@ -248,72 +248,68 @@ define([
> 				// only load modules
> 				if (!/^[\.]+/.test(_l)) {
> 					//do node_modules read
>-					var project = jsProject.getProjectPath();
>-					if(project) {
>-						return fileClient.read(project+"node_modules/"+_l+"/package.json", false, false, {readIfExists: true}).then(function(json) {
>-							if(json) {
>-								var val = JSON.parse(json);
>-								var mainPath = null;
>-								var main = val.main;
>-								if (main) {
>-									if (!/(\.js)$/.test(main)) {
>-										main += ".js";
>-									}
>-									mainPath = project + "node_modules/" + _l + "/" + main;
>-								} else {
>-									main = "index.js";
>-									mainPath = project + "node_modules/" + _l + "/index.js";
>+					var path = request.args.file.file;
>+					var index = path.lastIndexOf('/');
>+					var nodeFolderPath = path.substr(0, index + 1) +"node_modules/"+_l+"/"; // include the trailing / in the folder path
>+					return fileClient.read(nodeFolderPath+ "package.json", false, false, {readIfExists: true}).then(function(json) {
>+						if(json) {
>+							var val = JSON.parse(json);
>+							var mainPath = null;
>+							var main = val.main;
>+							if (main) {
>+								if (!/(\.js)$/.test(main)) {
>+									main += ".js";
> 								}
>-								return fileClient.read(mainPath).then(function(contents) {
>-									response.args.contents = contents;
>-									response.args.file = mainPath;
>-									response.args.path = main;
>-									ternWorker.postMessage(response);
>-								},
>-								function(err) {
>-									response.args.error = "Failed to read node_modules folder";
>-									response.args.message = err.toString();
>-									ternWorker.postMessage(response);
>-								});
>-							} 
>-							response.args.error = i18nUtil.formatMessage(javascriptMessages['failedToReadFile'], _l);
>-							response.args.message = "No file contents";
>-							ternWorker.postMessage(response);
>-						},
>-						function(err) {
>-							response.args.error = i18nUtil.formatMessage(javascriptMessages['failedToReadFile'], _l);
>-							response.args.message = err.toString();
>-							ternWorker.postMessage(response);
>-						});
>-					} 
>-					//don't search for now
>-					response.args.error = i18nUtil.formatMessage(javascriptMessages['failedToReadFile'], _l);
>-					ternWorker.postMessage(response);
>-				} else {
>-					// try to get the current folder from request.args.file.file
>-					var currentFile = request.args.file.file;
>-					if (currentFile) {
>-						var lastIndex = currentFile.lastIndexOf('/');
>-						var filePath = currentFile.substring(0, lastIndex + 1) + _l;
>-						if (!/\.js|\.json$/ig.test(_l)) {
>-							filePath += ".js";
>-						}
>-						return fileClient.read(filePath).then(function(contents) {
>-							response.args.contents = contents;
>-							response.args.file = filePath;
>-							response.args.path = _l;
>-							ternWorker.postMessage(response);
>-						},
>-						function(err) {
>-							response.args.error =  i18nUtil.formatMessage(javascriptMessages['failedToReadFile'], filePath);
>-							response.args.message = err.toString();
>-							ternWorker.postMessage(response);
>-						});
>-					} else {
>-						// could be a require('./....'); inside a module code
>+								mainPath = nodeFolderPath + main;
>+							} else {
>+								main = "index.js";
>+								mainPath = nodeFolderPath + "index.js";
>+							}
>+							return fileClient.read(mainPath).then(function(contents) {
>+								response.args.contents = contents;
>+								response.args.file = mainPath;
>+								response.args.path = main;
>+								ternWorker.postMessage(response);
>+							},
>+							function(err) {
>+								response.args.error = "Failed to read node_modules folder";
>+								response.args.message = err.toString();
>+								ternWorker.postMessage(response);
>+							});
>+						} 
>+						response.args.error = i18nUtil.formatMessage(javascriptMessages['failedToReadFile'], _l);
>+						response.args.message = "No file contents";
>+						ternWorker.postMessage(response);
>+					},
>+					function(err) {
> 						response.args.error = i18nUtil.formatMessage(javascriptMessages['failedToReadFile'], _l);
>+						response.args.message = err.toString();
> 						ternWorker.postMessage(response);
>+					});
>+				}
>+				// try to get the current folder from request.args.file.file
>+				var currentFile = request.args.file.file;
>+				if (currentFile) {
>+					var lastIndex = currentFile.lastIndexOf('/');
>+					var filePath = currentFile.substring(0, lastIndex + 1) + _l;
>+					if (!/\.js|\.json$/ig.test(_l)) {
>+						filePath += ".js";
> 					}
>+					return fileClient.read(filePath).then(function(contents) {
>+						response.args.contents = contents;
>+						response.args.file = filePath;
>+						response.args.path = _l;
>+						ternWorker.postMessage(response);
>+					},
>+					function(err) {
>+						response.args.error =  i18nUtil.formatMessage(javascriptMessages['failedToReadFile'], filePath);
>+						response.args.message = err.toString();
>+						ternWorker.postMessage(response);
>+					});
>+				} else {
>+					// could be a require('./....'); inside a module code
>+					response.args.error = i18nUtil.formatMessage(javascriptMessages['failedToReadFile'], _l);
>+					ternWorker.postMessage(response);
> 				}
> 			} else {
> 				scriptresolver.getWorkspaceFile(_l).then(function(files) {

Actions: View | Diff

Attachments on bug 492688: 261382 | 261383 | 261620 | 261765