Bug 525699 - Using only eslintConfig in package.json the ECMA version…

… is not correctly set
eclipse · Jan 31, 2018 · 3bd9412 · 3bd9412
1 parent 2cc747b
commit 3bd9412
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 3 deletions.
diff --git a/bundles/org.eclipse.orion.client.javascript/web/javascript/javascriptProject.js b/bundles/org.eclipse.orion.client.javascript/web/javascript/javascriptProject.js
@@ -1,6 +1,6 @@
 /*******************************************************************************
  * @license
- * Copyright (c) 2016, 2017 IBM Corporation and others.
+ * Copyright (c) 2016, 2018 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
@@ -500,6 +500,9 @@ define([
 									project.map.env.defs.push(project.DEFINITIONS+'/'+def.Name);
 								});
 							}
+							if(project.map.env.ternproject && project.map.env.ternproject.vals && project.map.env.ternproject.vals.ecmaVersion > project.map.env.ecmaVersion) {
+								project.map.env.ecmaVersion = project.map.env.ternproject.vals.ecmaVersion;
+							}
 							return project.map.env;
 						}, function rejected() {
 							return project.map.env;
@@ -616,7 +619,7 @@ define([
 				});
 			}
 			if(options.vals.ecmaVersion) {
-				project.map.env.ecmaVersion = options.vals.ecmaVersion;
+				project.map.env.ecmaVersion = translateEcma(options.vals.ecmaVersion);
 			}
 		}
 	}
@@ -657,6 +660,11 @@ define([
 						if(!project.map.env.eslint) {
 							project.map.env.eslint = {file: file, vals: vals.eslintConfig};
 						}
+						if(typeof vals.eslintConfig.ecmaVersion === "number") {
+							var val = translateEcma(vals.eslintConfig.ecmaVersion);
+							//what to do here is ecmaVersion is set via someone else? package.json will torch it
+							project.map.env.ecmaVersion = val;
+						}
 					}
 				}
 			} catch(e) {

diff --git a/....eclipse.orion.client.javascript/web/javascript/support/ternproject/ternProjectManager.js b/....eclipse.orion.client.javascript/web/javascript/support/ternproject/ternProjectManager.js
@@ -1,6 +1,6 @@
 /*******************************************************************************
  * @license
- * Copyright (c) 2015, 2017 IBM Corporation and others.
+ * Copyright (c) 2015, 2018 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
@@ -282,6 +282,15 @@ define([
 	 * @since 14.0
 	 */
 	function prepareOptions(json, env) {
+		if(typeof env.ecmaVersion === 'number') {
+			if(!json.ecmaVersion) {
+				//just set it
+				json.ecmaVersion = env.ecmaVersion;
+			} else if(env.ecmaVersion > json.ecmaVersion){
+				//only set it if its greater (more compatible) - don't downgrade ECMA via multiple configs
+				json.ecmaVersion = env.ecmaVersion;
+			}
+		}
 		if(env && env.envs) {
 			//TODO make this more dynamic once we have the ability to install definition files and plugins
 			TernDefaults.defNames.forEach(function(def) {