From a9af4960cb48a5959b6b2a5975c7762e7ca209e4 Mon Sep 17 00:00:00 2001
From: pTalanov <Pavel.Talanov@jetbrains.com>
Date: Tue, 15 May 2012 18:39:43 +0400
Subject: [PATCH] Introduce some convenience methods related to EcmaVersion

---
 .../cli/src/org/jetbrains/jet/cli/js/K2JSCompiler.java     | 6 +++---
 idea/src/org/jetbrains/jet/plugin/project/IDEAConfig.java  | 4 ++--
 .../test/org/jetbrains/k2js/test/config/TestConfig.java    | 4 ++--
 js/js.translator/src/org/jetbrains/k2js/config/Config.java | 6 +++---
 .../src/org/jetbrains/k2js/config/EcmaVersion.java         | 7 ++++++-
 .../jetbrains/k2js/config/ZippedLibrarySourcesConfig.java  | 4 ++--
 6 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/compiler/cli/src/org/jetbrains/jet/cli/js/K2JSCompiler.java b/compiler/cli/src/org/jetbrains/jet/cli/js/K2JSCompiler.java
index ec756937b4a..6f69093b3dd 100644
--- a/compiler/cli/src/org/jetbrains/jet/cli/js/K2JSCompiler.java
+++ b/compiler/cli/src/org/jetbrains/jet/cli/js/K2JSCompiler.java
@@ -35,6 +35,7 @@ import org.jetbrains.jet.lang.resolve.BindingContext;
 import org.jetbrains.jet.lang.types.lang.JetStandardLibrary;
 import org.jetbrains.k2js.analyze.AnalyzerFacadeForJS;
 import org.jetbrains.k2js.config.Config;
+import org.jetbrains.k2js.config.EcmaVersion;
 import org.jetbrains.k2js.config.ZippedLibrarySourcesConfig;
 import org.jetbrains.k2js.facade.K2JSTranslator;
 
@@ -93,8 +94,7 @@ public class K2JSCompiler extends CLICompiler<K2JSCompilerArguments, K2JSCompile
     private static ExitCode translateAndGenerateOutputFile(@NotNull PrintingMessageCollector messageCollector,
             @NotNull JetCoreEnvironment environmentForJS, @NotNull Config config, @NotNull String outputFile) {
         try {
-            K2JSTranslator.translateWithCallToMainAndSaveToFile(environmentForJS.getSourceFiles(), outputFile, config
-            );
+            K2JSTranslator.translateWithCallToMainAndSaveToFile(environmentForJS.getSourceFiles(), outputFile, config);
         }
         catch (Exception e) {
             messageCollector.report(CompilerMessageSeverity.ERROR, "Exception while translating:\n" + e.getMessage(),
@@ -123,6 +123,6 @@ public class K2JSCompiler extends CLICompiler<K2JSCompilerArguments, K2JSCompile
         if (arguments.libzip == null) {
             return Config.getEmptyConfig(project, arguments.target);
         }
-        return new ZippedLibrarySourcesConfig(project, arguments.libzip, arguments.target);
+        return new ZippedLibrarySourcesConfig(project, arguments.libzip, EcmaVersion.fromString(arguments.target));
     }
 }
diff --git a/idea/src/org/jetbrains/jet/plugin/project/IDEAConfig.java b/idea/src/org/jetbrains/jet/plugin/project/IDEAConfig.java
index d9fb9627575..db29e72d794 100644
--- a/idea/src/org/jetbrains/jet/plugin/project/IDEAConfig.java
+++ b/idea/src/org/jetbrains/jet/plugin/project/IDEAConfig.java
@@ -18,6 +18,7 @@ package org.jetbrains.jet.plugin.project;
 
 import com.intellij.openapi.project.Project;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.k2js.config.EcmaVersion;
 import org.jetbrains.k2js.config.ZippedLibrarySourcesConfig;
 
 import static org.jetbrains.jet.plugin.project.JsModuleDetector.getLibLocationAndTargetForProject;
@@ -26,8 +27,7 @@ import static org.jetbrains.jet.plugin.project.JsModuleDetector.getLibLocationAn
  * @author Pavel Talanov
  */
 public final class IDEAConfig extends ZippedLibrarySourcesConfig {
-
     public IDEAConfig(@NotNull Project project) {
-        super(project, getLibLocationAndTargetForProject(project).first, null);
+        super(project, getLibLocationAndTargetForProject(project).first, EcmaVersion.defaultVersion());
     }
 }
diff --git a/js/js.tests/test/org/jetbrains/k2js/test/config/TestConfig.java b/js/js.tests/test/org/jetbrains/k2js/test/config/TestConfig.java
index 021bc4494a0..c35a63c3ac6 100644
--- a/js/js.tests/test/org/jetbrains/k2js/test/config/TestConfig.java
+++ b/js/js.tests/test/org/jetbrains/k2js/test/config/TestConfig.java
@@ -22,6 +22,7 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jet.lang.psi.JetFile;
 import org.jetbrains.k2js.config.Config;
+import org.jetbrains.k2js.config.EcmaVersion;
 import org.jetbrains.k2js.utils.JetFileUtils;
 
 import java.io.FileInputStream;
@@ -36,12 +37,11 @@ import java.util.List;
 //TODO: review/refactor
 public final class TestConfig extends Config {
 
-
     @Nullable
     private /*var*/ List<JetFile> jsLibFiles = null;
 
     public TestConfig(@NotNull Project project) {
-        super(project, null);
+        super(project, EcmaVersion.v3);
     }
 
     @NotNull
diff --git a/js/js.translator/src/org/jetbrains/k2js/config/Config.java b/js/js.translator/src/org/jetbrains/k2js/config/Config.java
index e95611740a3..fafa190127a 100644
--- a/js/js.translator/src/org/jetbrains/k2js/config/Config.java
+++ b/js/js.translator/src/org/jetbrains/k2js/config/Config.java
@@ -34,7 +34,7 @@ public abstract class Config {
 
     @NotNull
     public static Config getEmptyConfig(@NotNull Project project, @Nullable String target) {
-        return new Config(project, target) {
+        return new Config(project, EcmaVersion.fromString(target)) {
             @NotNull
             @Override
             protected List<JetFile> generateLibFiles() {
@@ -70,9 +70,9 @@ public abstract class Config {
     @NotNull
     private final EcmaVersion target;
 
-    public Config(@NotNull Project project, @Nullable String target) {
+    public Config(@NotNull Project project, @NotNull EcmaVersion ecmaVersion) {
         this.project = project;
-        this.target = EcmaVersion.fromString(target);
+        this.target = ecmaVersion;
     }
 
     @NotNull
diff --git a/js/js.translator/src/org/jetbrains/k2js/config/EcmaVersion.java b/js/js.translator/src/org/jetbrains/k2js/config/EcmaVersion.java
index 38217ec8935..b17fc2acde7 100644
--- a/js/js.translator/src/org/jetbrains/k2js/config/EcmaVersion.java
+++ b/js/js.translator/src/org/jetbrains/k2js/config/EcmaVersion.java
@@ -27,7 +27,12 @@ public enum EcmaVersion {
     v3, v5;
 
     @NotNull
-    static EcmaVersion fromString(@Nullable String target) {
+    public static EcmaVersion fromString(@Nullable String target) {
         return StringUtil.compareVersionNumbers(target, "5") >= 0 ? v5 : v3;
     }
+
+    @NotNull
+    public static EcmaVersion defaultVersion() {
+        return v3;
+    }
 }
diff --git a/js/js.translator/src/org/jetbrains/k2js/config/ZippedLibrarySourcesConfig.java b/js/js.translator/src/org/jetbrains/k2js/config/ZippedLibrarySourcesConfig.java
index d873252e882..83ac136dc4f 100644
--- a/js/js.translator/src/org/jetbrains/k2js/config/ZippedLibrarySourcesConfig.java
+++ b/js/js.translator/src/org/jetbrains/k2js/config/ZippedLibrarySourcesConfig.java
@@ -40,8 +40,8 @@ public class ZippedLibrarySourcesConfig extends Config {
     @Nullable
     protected final String pathToLibZip;
 
-    public ZippedLibrarySourcesConfig(@NotNull Project project, @Nullable String pathToZip, @Nullable String target) {
-        super(project, target);
+    public ZippedLibrarySourcesConfig(@NotNull Project project, @Nullable String pathToZip, @NotNull EcmaVersion ecmaVersion) {
+        super(project, ecmaVersion);
         pathToLibZip = pathToZip;
     }