Use tern 0.20.0

Author: angelozerr

core/tern.core.tests/src/tern/TernRepositoryTest.java

@@ -31,7 +31,7 @@ public void defaultRepository() throws TernException {
 		}
 		assertHasModule(repository, "browser");
 		assertHasModule(repository, "chai");
-		assertHasModule(repository, "ecma5");
+		assertHasModule(repository, "ecmascript");
 		assertHasModule(repository, "jquery");
 		assertHasModule(repository, "underscore");
 		assertHasModule(repository, "angular");

core/tern.core.tests/src/tern/resources/TernProjectTest.java

@@ -43,9 +43,9 @@ public void addLibs() throws IOException {
 		Assert.assertEquals("{\"libs\":[\"browser\"]}", project.toString());
 
 		// add new lib, project should be dirty
-		project.addLib(TernDef.ecma5);
+		project.addLib(TernDef.ecmascript);
 		Assert.assertTrue(project.isDirty());
-		Assert.assertEquals("{\"libs\":[\"browser\",\"ecma5\"]}",
+		Assert.assertEquals("{\"libs\":[\"browser\",\"ecmascript\"]}",
 				project.toString());
 	}
 
@@ -56,9 +56,9 @@ public void loadAndAddLibs() throws IOException {
 		TernProject project1 = new TernProject(projectDir);
 
 		// add new lib, project should be dirty
-		project1.addLib(TernDef.ecma5);
+		project1.addLib(TernDef.ecmascript);
 		Assert.assertTrue(project1.isDirty());
-		Assert.assertEquals("{\"libs\":[\"ecma5\"]}", project1.toString());
+		Assert.assertEquals("{\"libs\":[\"ecmascript\"]}", project1.toString());
 
 		// save the project, project should be NOT dirty
 		project1.save();
@@ -78,7 +78,7 @@ public void loadAndAddLibs() throws IOException {
 		project.addLib(TernDef.browser);
 		Assert.assertTrue(project.isDirty());
 
-		Assert.assertEquals("{\"libs\":[\"ecma5\",\"browser\"]}",
+		Assert.assertEquals("{\"libs\":[\"ecmascript\",\"browser\"]}",
 				project.toString());
 	}
 

core/tern.core/src/tern/EcmaVersion.java

@@ -2,7 +2,7 @@
 
 public enum EcmaVersion {
 
-	ES5(), ES6();
+	ES5(), ES6(), ES7();
 
 	private final String versionLabel;
 	private final int version;

core/tern.core/src/tern/resources/TernProject.java

@@ -153,15 +153,6 @@ public void setEcmaVersion(EcmaVersion ecmaVersion) {
 	@Override
 	public EcmaVersion getEcmaVersion() {
 		int version = super.getInt(ECMA_VERSION_FIELD_NAME, -1);
-		if (version == -1) {
-			// Search if .tern-project contains ecma5.json, etc
-			if (hasLib(TernDef.ecma6)) {
-				return EcmaVersion.ES6;
-			}
-			if (hasLib(TernDef.ecma5)) {
-				return EcmaVersion.ES5;
-			}
-		}
 		return EcmaVersion.get(version);
 	}
 

core/tern.core/src/tern/server/AbstractScriptEngineTernServer.java

@@ -116,12 +116,14 @@ protected TernResources loadTern() throws TernException {
 			}
 			switch (ecmaVersion) {
 			case ES5:
-				addDef(TernDef.ecma5.getName(), repository, defs, false);
+				addDef(TernDef.ecmascript.getName(), repository, defs, false);
 				break;
 			case ES6:
-				addDef(TernDef.ecma5.getName(), repository, defs, false);
-				addDef(TernDef.ecma6.getName(), repository, defs, false);
+				addDef(TernDef.ecmascript.getName(), repository, defs, false);
 				break;
+			case ES7:
+				addDef(TernDef.ecmascript.getName(), repository, defs, false);
+				break;				
 			}
 
 			// Load defs
@@ -155,7 +157,7 @@ protected TernResources loadTern() throws TernException {
 
 	protected void addDef(String def, ITernRepository repository, List<TernResource> defs, boolean ignoreEcma)
 			throws IOException {
-		if (ignoreEcma && (def.equals(TernDef.ecma5.getName()) || def.equals(TernDef.ecma6.getName()))) {
+		if (ignoreEcma && (def.equals(TernDef.ecmascript.getName()))) {
 			return;
 		}
 		ITernModule module = repository.getModule(def);

core/tern.core/src/tern/server/TernDef.java

@@ -17,8 +17,7 @@ public enum TernDef implements ITernDef {
 	browser("browser"),
 
 	chai("chai"), 
-	ecma5("ecma5"), 
-	ecma6("ecma6"), 
+	ecmascript("ecmascript"), 
 
 	jquery("jquery"), 
 	underscore("underscore"),