Bug 521560 - Duplicate ternProjectManager and ternProjectValidator cl…

…asses (#159)
eclipse · Aug 29, 2017 · 6a5a05d · 6a5a05d
1 parent 3504f96
commit 6a5a05d
Show file tree

Hide file tree

Showing 7 changed files with 123 additions and 660 deletions.
diff --git a/...clipse.orion.client.javascript/web/javascript/support/ternproject/ternProjectValidator.js b/...clipse.orion.client.javascript/web/javascript/support/ternproject/ternProjectValidator.js
@@ -64,7 +64,9 @@ define([
 										switch(key) {
 											case "ecmaVersion":
 											case "dependencyBudget": {
-												if(typeof property.value.value !== 'number') {
+												if(!property.value) {
+													report(problems, i18nUtil.formatMessage(Messages['notNum'], key), property.range);
+												} else if(typeof property.value.value !== 'number') {
 													report(problems, i18nUtil.formatMessage(Messages['notNum'], key), property.value.range);
 												}
 												break;
@@ -73,7 +75,9 @@ define([
 											case 'dontLoad':
 											case 'loadEagerly': {
 												var arr = property.value;
-												if(arr.type !== 'ArrayExpression') {
+												if(!arr) {
+													report(problems, i18nUtil.formatMessage(Messages['notArray'], key), property.range);
+												} else if(arr.type !== 'ArrayExpression') {
 													report(problems, i18nUtil.formatMessage(Messages['notArray'], key), arr.range);
 												} else if(arr.elements) {
 													if(arr.elements.length < 1 && key !== 'loadEagerly') {
@@ -89,11 +93,15 @@ define([
 											}
 											case 'plugins': {
 												var obj = property.value;
-												if(obj.value === null || obj.type !== 'ObjectExpression') {
+												if(!obj) {
+													report(problems, i18nUtil.formatMessage(Messages['notObject'], key), property.range);
+												} else if(obj.value === null || obj.type !== 'ObjectExpression') {
 													report(problems, i18nUtil.formatMessage(Messages['notObject'], key), obj.range);
 												} else if(obj.properties) {
 													obj.properties.forEach(function(prop) {
-														if(prop.value === null || !(prop.value.type === 'ObjectExpression' || (prop.value.type === 'Literal' && typeof prop.value.value === 'boolean'))) {
+														if(prop.value === null) {
+															report(problems, i18nUtil.formatMessage(Messages['pluginNotObject'], prop.key.value), prop.range);
+														} else if(!(prop.value.type === 'ObjectExpression' || (prop.value.type === 'Literal' && typeof prop.value.value === 'boolean'))) {
 															report(problems, i18nUtil.formatMessage(Messages['pluginNotObject'], prop.key.value), prop.value.range);
 														}
 													});

diff --git a/bundles/org.eclipse.orion.client.javascript/web/javascript/ternProjectManager.js b/bundles/org.eclipse.orion.client.javascript/web/javascript/ternProjectManager.js