Convert AnalyzeExhaust to Kotlin and make it a data class

2014-11-19 19:43:05 +03:00
parent 341d4a7a26
commit 1991f0119e
14 changed files with 77 additions and 104 deletions
@@ -1,77 +0,0 @@
-/*
- * Copyright 2010-2013 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.jetbrains.jet.analyzer;
-
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-import org.jetbrains.jet.lang.descriptors.ModuleDescriptor;
-import org.jetbrains.jet.lang.resolve.BindingContext;
-import org.jetbrains.jet.lang.types.ErrorUtils;
-
-public class AnalyzeExhaust {
-    public static final AnalyzeExhaust EMPTY = success(BindingContext.EMPTY, ErrorUtils.getErrorModule());
-
-    @NotNull
-    public static AnalyzeExhaust success(@NotNull BindingContext bindingContext, @NotNull ModuleDescriptor module) {
-        return new AnalyzeExhaust(bindingContext, module, null);
-    }
-
-    @NotNull
-    public static AnalyzeExhaust error(@NotNull BindingContext bindingContext, @NotNull Throwable error) {
-        return new AnalyzeExhaust(bindingContext, ErrorUtils.getErrorModule(), error);
-    }
-
-    private final BindingContext bindingContext;
-    private final Throwable error;
-    private final ModuleDescriptor moduleDescriptor;
-
-    private AnalyzeExhaust(
-            @NotNull BindingContext bindingContext,
-            @NotNull ModuleDescriptor moduleDescriptor,
-            @Nullable Throwable error
-    ) {
-        this.bindingContext = bindingContext;
-        this.error = error;
-        this.moduleDescriptor = moduleDescriptor;
-    }
-
-    @NotNull
-    public BindingContext getBindingContext() {
-        return bindingContext;
-    }
-
-    @NotNull
-    public Throwable getError() {
-        if (error == null) throw new IllegalStateException("Should be called only for error analyze result");
-        return error;
-    }
-
-    public boolean isError() {
-        return error != null;
-    }
-
-    public void throwIfError() {
-        if (isError()) {
-            throw new IllegalStateException("failed to analyze: " + error, error);
-        }
-    }
-
-    @NotNull
-    public ModuleDescriptor getModuleDescriptor() {
-        return moduleDescriptor;
-    }
-}
@@ -0,0 +1,53 @@
+/*
+ * Copyright 2010-2014 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jetbrains.jet.analyzer
+
+import org.jetbrains.jet.lang.descriptors.ModuleDescriptor
+import org.jetbrains.jet.lang.resolve.BindingContext
+import org.jetbrains.jet.lang.types.ErrorUtils
+import kotlin.platform.platformStatic
+
+public data open class AnalyzeExhaust protected (
+        public val bindingContext: BindingContext,
+        public val moduleDescriptor: ModuleDescriptor
+) {
+
+    public val error: Throwable
+        get() = if (this is Error) this.exception else throw IllegalStateException("Should only be called for error analyze exhaust")
+
+    public fun isError(): Boolean = this is Error
+
+    public fun throwIfError() {
+        if (isError()) {
+            throw IllegalStateException("failed to analyze: " + error, error)
+        }
+    }
+
+    private class Error(bindingContext: BindingContext, val exception: Throwable) : AnalyzeExhaust(bindingContext, ErrorUtils.getErrorModule())
+
+    class object {
+        public val EMPTY: AnalyzeExhaust = success(BindingContext.EMPTY, ErrorUtils.getErrorModule())
+
+        platformStatic public fun success(bindingContext: BindingContext, module: ModuleDescriptor): AnalyzeExhaust {
+            return AnalyzeExhaust(bindingContext, module)
+        }
+
+        platformStatic public fun error(bindingContext: BindingContext, error: Throwable): AnalyzeExhaust {
+            return Error(bindingContext, error)
+        }
+    }
+}
@@ -48,7 +48,7 @@ public abstract class AbstractResolvedCallsTest() : JetLiteFixture() {
        val text = JetTestUtils.doLoadFile(File(filePath))!!

        val jetFile = JetPsiFactory(getProject()).createFile(text.replace("<caret>", ""))
-        val bindingContext = JvmResolveUtil.analyzeOneFileWithJavaIntegration(jetFile).getBindingContext()
+        val bindingContext = JvmResolveUtil.analyzeOneFileWithJavaIntegration(jetFile).bindingContext

        val element = jetFile.findElementAt(text.indexOf("<caret>"))
        val expression = PsiTreeUtil.getParentOfType(element, javaClass<JetExpression>())
@@ -74,8 +74,7 @@ abstract public class AbstractConstraintSystemTest() : JetLiteFixture() {
        val fileName = "declarations/declarations.kt"

        val psiFile = createPsiFile(null, fileName, loadFile(fileName))!!
-        val analyzeExhaust = JvmResolveUtil.analyzeOneFileWithJavaIntegrationAndCheckForErrors(psiFile)
-        val bindingContext = analyzeExhaust.getBindingContext()
+        val bindingContext = JvmResolveUtil.analyzeOneFileWithJavaIntegrationAndCheckForErrors(psiFile).bindingContext
        return MyDeclarations(bindingContext, getProject(), typeResolver)
    }