Attachment 266573 Details for Bug 511478 – updated fix

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

[patch] updated fix

lint-option-sync2.patch (text/plain), 5.86 KB, created by Michael Rennie

on 2017-02-01 13:37:52 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Rennie

Created: 2017-02-01 13:37:52 EST

Size: 5.86 KB

patch

obsolete

>diff --git a/bundles/org.eclipse.orion.client.javascript/web/javascript/javascriptProject.js b/bundles/org.eclipse.orion.client.javascript/web/javascript/javascriptProject.js
>index 8a539f5..f9b55e2 100644
>--- a/bundles/org.eclipse.orion.client.javascript/web/javascript/javascriptProject.js
>+++ b/bundles/org.eclipse.orion.client.javascript/web/javascript/javascriptProject.js
>@@ -79,6 +79,7 @@ define([
> 		this.fileClient = null;
> 		this.handlers = [eslintHandler];
> 		this.projectFiles = [this.PACKAGE_JSON, this.TERN_PROJECT, this.ESLINTRC, this.ESLINTRC_JS, this.ESLINTRC_JSON, this.ESLINTRC_YAML, this.ESLINTRC_YML];
>+        this.lintFiles = [this.ESLINTRC_JS, this.ESLINTRC_JSON, this.ESLINTRC, this.ESLINTRC_YAML, this.ESLINTRC_YML, this.PACKAGE_JSON];
> 	}
> 	/**
> 	 * The .tern-project file name
>@@ -307,50 +308,35 @@ define([
> 	 * @see http://eslint.org/docs/user-guide/configuring
> 	 */
> 	JavaScriptProject.prototype.getESlintOptions = function getESlintOptions() {
>+        var deferred = new Deferred();
> 		if(this.map.eslint) {
>-			return new Deferred().resolve(this.map.eslint);
>+			return deferred.resolve(this.map.eslint);
> 		}
>-		var vals;
>-		return this.getFile(this.ESLINTRC_JS).then(function(file) {
>-			vals = readAndMap(this.map, file, "eslint");
>-			if(vals) {
>-				return vals;
>-			}
>-			return this.getFile(this.ESLINTRC_JSON).then(function(file) {
>-				vals = readAndMap(this.map, file, "eslint");
>-				if(vals) {
>-					return vals;
>-				}
>-				return this.getFile(this.ESLINTRC).then(function(file) {
>-					vals = readAndMap(this.map, file, "eslint");
>-					if(vals) {
>-						return vals;
>-					}
>-					return this.getFile(this.ESLINTRC_YAML).then(function(file) {
>-						vals = readAndMap(this.map, file, "eslint");
>-						if (vals) {
>-							return vals;
>-						}
>-						return this.getFile(this.ESLINTRC_YML).then(function(file) {
>-							vals = readAndMap(this.map, file, "eslint");
>-							if (vals) {
>-								return vals;
>-							}
>-							return this.getFile(this.PACKAGE_JSON).then(function(file) {
>-								if(file && file.contents) {
>-									vals = JSON.parse(file.contents);
>-									if(vals.eslintConfig !== null && typeof vals.eslintConfig === 'object' && Object.keys(vals.eslintConfig).length > 0) {
>-										this.map.eslint = vals.eslintConfig;
>-										return this.map.eslint;
>-									}
>-								}
>-								return null;
>-							}.bind(this));
>-						}.bind(this));
>-					}.bind(this));
>-				}.bind(this));
>-			}.bind(this));
>-		}.bind(this));
>+        this.projectPromise.then(function() {
>+            this.lintFiles.reduce(function(prev, next) {
>+                if(next === this.PACKAGE_JSON) {
>+                    return this.getFile(next).then(function(file) {
>+                        if(file && file.contents) {
>+                            var vals = JSON.parse(file.contents);
>+                            if(vals.eslintConfig !== null && typeof vals.eslintConfig === 'object' && Object.keys(vals.eslintConfig).length > 0) {
>+                                this.map.eslint = vals.eslintConfig;
>+                                deferred.resolve(this.map.eslint);
>+                                return;
>+                            }
>+                        }
>+                        deferred.resolve(null);
>+                    }.bind(this))
>+                }
>+                return this.getFile(next).then(function(file) {
>+                    var vals = readAndMap(this.map, file, "eslint");
>+                    if(vals) {
>+                        deferred.resolve(vals);
>+                        throw new Error("stop");
>+                    }
>+                }.bind(this));
>+            }.bind(this) , new Deferred().resolve());
>+        }.bind(this));
>+        return deferred;
> 	};
> 
> 	/**
>@@ -416,6 +402,7 @@ define([
> 		initialized = true;
> 		var file = evnt.file;
> 		resolveProject.call(this, file).then(function(project) {
>+            this.projectPromise.resolve(project);
> 			if (project) {
> 				if(!this.projectMeta || project.Location !== this.projectMeta.Location) {
> 					this.projectMeta = project;
>@@ -449,10 +436,12 @@ define([
> 	 */
> 	function resolveProject(file) {
> 		var deferred = new Deferred();
>+        this.projectPromise = new Deferred();
> 		if(file) {
>-			if(this.projectMeta && file.Location && file.Location.startsWith(this.projectMeta.Location)) {
>+            var floc = file.Location ? file.Location : file.location; 
>+			if(this.projectMeta && floc && floc.startsWith(this.projectMeta.Location)) {
> 				deferred.resolve(this.projectMeta);
>-				return;
>+				return deferred;
> 			}
> 			var parents = file.parents ? file.parents : file.Parents;
> 			if(!Array.isArray(parents) || parents.length < 1) {
>@@ -463,19 +452,17 @@ define([
> 					var promises = [],
> 						prnt = parents[parents.length-1];
> 					this.projectFiles.forEach(function(_f) {
>-						promises.push(this.getFile(_f, prnt.Location));
>-						promises.push(this.getFile(_f, "/file/"));
>+						promises.push({f: _f, p: prnt.Location});
>+						promises.push({p: "/file/", f:_f});
> 					}.bind(this));
> 					promises.reduce(/* @callback */ function(prev, item) {
>-						return prev.then(/* @callback */ function(value) {
>-							return item.then(function(_file) {
>-								if(_file) {
>-									deferred.resolve({Location: _file.project});
>-									throw new Error("stop");
>-								}
>-							});
>-						});
>-					}, new Deferred().resolve());
>+                        return this.getFile(item.f, item.p).then(function(_file) {
>+                            if(_file && _file.contents) {
>+                                deferred.resolve({Location: _file.project});
>+                                throw new Error("stop");
>+                            }
>+                        });
>+					}.bind(this), new Deferred().resolve());
> 				} else {
> 					deferred.resolve(parents[parents.length-1]);
> 				}

Actions: View | Diff

Attachments on bug 511478: 266572 | 266573 | 266574