azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolve/*Diagnostics* -> resolve/diagnostics/*Diagnostics*

Browse Source 
And remove unused TraceUtil.java
This commit is contained in:
Zalim Bashorov
2014-12-26 15:18:52 +03:00
parent d4e90b5bc3
commit 41dff74037
28 changed files with 41 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/cli/src/org/jetbrains/jet/cli/common/messages/AnalyzerWithCompilerReport.java
+5 -1
View File
@@ -31,7 +31,11 @@ import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor;
import org.jetbrains.jet.lang.diagnostics.*;
import org.jetbrains.jet.lang.diagnostics.rendering.DefaultErrorMessages;
import org.jetbrains.jet.lang.psi.JetFile;
import org.jetbrains.jet.lang.resolve.*;
import org.jetbrains.jet.lang.resolve.AnalyzingUtils;
import org.jetbrains.jet.lang.resolve.BindingContext;
import org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils;
import org.jetbrains.jet.lang.resolve.DescriptorUtils;
import org.jetbrains.jet.lang.resolve.diagnostics.Diagnostics;
import org.jetbrains.jet.lang.resolve.java.JavaBindingContext;
import org.jetbrains.jet.lang.resolve.java.JvmAbi;
import org.jetbrains.jet.lang.resolve.java.JvmClassName;
compiler/cli/src/org/jetbrains/jet/cli/js/K2JSCompiler.java
+1 -1
View File
@@ -50,7 +50,7 @@ import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment;
import org.jetbrains.jet.config.CompilerConfiguration;
import org.jetbrains.jet.config.Services;
import org.jetbrains.jet.lang.psi.JetFile;
import org.jetbrains.jet.lang.resolve.Diagnostics;
import org.jetbrains.jet.lang.resolve.diagnostics.Diagnostics;
import org.jetbrains.jet.utils.PathUtil;
import org.jetbrains.k2js.analyze.TopDownAnalyzerFacadeForJS;
import org.jetbrains.k2js.config.*;
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/native.kt
+1 -1
View File
@@ -16,7 +16,7 @@
package org.jetbrains.jet.lang.resolve.kotlin.nativeDeclarations
import org.jetbrains.jet.lang.resolve.DiagnosticsWithSuppression
import org.jetbrains.jet.lang.resolve.diagnostics.DiagnosticsWithSuppression
import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor
import org.jetbrains.jet.lang.resolve.DescriptorUtils
import org.jetbrains.jet.lang.diagnostics.Errors
compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/DiagnosticUtils.java
+5 -5
View File
@@ -29,7 +29,7 @@ import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor;
import org.jetbrains.jet.lang.psi.JetExpression;
import org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils;
import org.jetbrains.jet.lang.resolve.Diagnostics;
import org.jetbrains.jet.lang.resolve.diagnostics.Diagnostics;
import java.util.Collection;
import java.util.Collections;
@@ -40,7 +40,7 @@ public class DiagnosticUtils {
@NotNull
private static final Comparator<TextRange> TEXT_RANGE_COMPARATOR = new Comparator<TextRange>() {
@Override
public int compare(TextRange o1, TextRange o2) {
public int compare(@NotNull TextRange o1, @NotNull TextRange o2) {
if (o1.getStartOffset() != o2.getStartOffset()) {
return o1.getStartOffset() - o2.getStartOffset();
}
@@ -57,10 +57,10 @@ public class DiagnosticUtils {
element = DescriptorToSourceUtils.descriptorToDeclaration(descriptor.getOriginal());
}
if (element == null && descriptor instanceof ASTNode) {
element = DiagnosticUtils.getClosestPsiElement((ASTNode) descriptor);
element = getClosestPsiElement((ASTNode) descriptor);
}
if (element != null) {
return DiagnosticUtils.atLocation(element);
return atLocation(element);
} else {
return "unknown location";
}
@@ -162,7 +162,7 @@ public class DiagnosticUtils {
public static List<Diagnostic> sortedDiagnostics(@NotNull Collection<Diagnostic> diagnostics) {
Comparator<Diagnostic> diagnosticComparator = new Comparator<Diagnostic>() {
@Override
public int compare(Diagnostic d1, Diagnostic d2) {
public int compare(@NotNull Diagnostic d1, @NotNull Diagnostic d2) {
String path1 = d1.getPsiFile().getViewProvider().getVirtualFile().getPath();
String path2 = d2.getPsiFile().getViewProvider().getVirtualFile().getPath();
if (!path1.equals(path2)) return path1.compareTo(path2);
compiler/frontend/src/org/jetbrains/jet/lang/resolve/BindingContext.java
+1
View File
@@ -31,6 +31,7 @@ import org.jetbrains.jet.lang.resolve.calls.inference.ConstraintSystemCompleter;
import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall;
import org.jetbrains.jet.lang.resolve.calls.smartcasts.DataFlowInfo;
import org.jetbrains.jet.lang.resolve.constants.CompileTimeConstant;
import org.jetbrains.jet.lang.resolve.diagnostics.Diagnostics;
import org.jetbrains.jet.lang.resolve.name.FqName;
import org.jetbrains.jet.lang.resolve.name.FqNameUnsafe;
import org.jetbrains.jet.lang.resolve.scopes.JetScope;
compiler/frontend/src/org/jetbrains/jet/lang/resolve/BindingTraceContext.java
+2
View File
@@ -20,6 +20,8 @@ import com.google.common.collect.ImmutableMap;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.TestOnly;
import org.jetbrains.jet.lang.diagnostics.Diagnostic;
import org.jetbrains.jet.lang.resolve.diagnostics.Diagnostics;
import org.jetbrains.jet.lang.resolve.diagnostics.MutableDiagnosticsWithSuppression;
import org.jetbrains.jet.util.slicedmap.*;
import java.util.Collection;
compiler/frontend/src/org/jetbrains/jet/lang/resolve/CompositeBindingContext.kt
+1
View File
@@ -22,6 +22,7 @@ import com.google.common.collect.ImmutableMap
import org.jetbrains.jet.lang.diagnostics.Diagnostic
import com.intellij.psi.PsiElement
import com.intellij.openapi.util.ModificationTracker
import org.jetbrains.jet.lang.resolve.diagnostics.Diagnostics
public class CompositeBindingContext private (
private val delegates: List<BindingContext>
compiler/frontend/src/org/jetbrains/jet/lang/resolve/DelegatingBindingTrace.java
+2
View File
@@ -23,6 +23,8 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.annotations.TestOnly;
import org.jetbrains.jet.lang.diagnostics.Diagnostic;
import org.jetbrains.jet.lang.resolve.diagnostics.Diagnostics;
import org.jetbrains.jet.lang.resolve.diagnostics.MutableDiagnosticsWithSuppression;
import org.jetbrains.jet.util.slicedmap.*;
import java.util.Collection;
compiler/frontend/src/org/jetbrains/jet/lang/resolve/TraceUtil.java
-120
View File
@@ -1,120 +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.lang.resolve;
import com.google.common.collect.ImmutableMap;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.lang.diagnostics.Diagnostic;
import org.jetbrains.jet.util.slicedmap.ReadOnlySlice;
import org.jetbrains.jet.util.slicedmap.WritableSlice;
import java.util.Collection;
public class TraceUtil {
public final static BindingTrace TRACE_STUB = new BindingTrace() {
@NotNull
@Override
public BindingContext getBindingContext() {
return BINDING_CONTEXT_STUB;
}
@Override
public <K, V> void record(WritableSlice<K, V> slice, K key, V value) {
throw new IllegalStateException();
}
@Override
public <K> void record(WritableSlice<K, Boolean> slice, K key) {
throw new IllegalStateException();
}
@Nullable
@Override
public <K, V> V get(ReadOnlySlice<K, V> slice, K key) {
throw new IllegalStateException();
}
@NotNull
@Override
public <K, V> Collection<K> getKeys(WritableSlice<K, V> slice) {
throw new IllegalStateException();
}
@Override
public void report(@NotNull Diagnostic diagnostic) {
throw new IllegalStateException();
}
};
public final static BindingContext BINDING_CONTEXT_STUB = new BindingContext() {
@NotNull
@Override
public Diagnostics getDiagnostics() {
throw new IllegalStateException();
}
@Nullable
@Override
public <K, V> V get(ReadOnlySlice<K, V> slice, K key) {
throw new IllegalStateException();
}
@NotNull
@Override
public <K, V> Collection<K> getKeys(WritableSlice<K, V> slice) {
throw new IllegalStateException();
}
@NotNull
@Override
public <K, V> ImmutableMap<K, V> getSliceContents(@NotNull ReadOnlySlice<K, V> slice) {
throw new IllegalStateException();
}
};
public final static DelegatingBindingTrace DELEGATING_TRACE_STUB = new DelegatingBindingTrace(BINDING_CONTEXT_STUB, "Delegating trace stub") {
@Override
public <K, V> void record(WritableSlice<K, V> slice, K key, V value) {
throw new IllegalStateException();
}
@Override
public <K> void record(WritableSlice<K, Boolean> slice, K key) {
throw new IllegalStateException();
}
@Nullable
@Override
public <K, V> V get(ReadOnlySlice<K, V> slice, K key) {
throw new IllegalStateException();
}
@NotNull
@Override
public <K, V> Collection<K> getKeys(WritableSlice<K, V> slice) {
throw new IllegalStateException();
}
@Override
public void report(@NotNull Diagnostic diagnostic) {
throw new IllegalStateException();
}
};
}
compiler/frontend/src/org/jetbrains/jet/lang/resolve/Diagnostics.kt → compiler/frontend/src/org/jetbrains/jet/lang/resolve/diagnostics/Diagnostics.kt
+1 -1
View File
@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.jetbrains.jet.lang.resolve
package org.jetbrains.jet.lang.resolve.diagnostics
import com.intellij.psi.PsiElement
import org.jetbrains.jet.lang.diagnostics.Diagnostic
compiler/frontend/src/org/jetbrains/jet/lang/resolve/DiagnosticsElementsCache.java → compiler/frontend/src/org/jetbrains/jet/lang/resolve/diagnostics/DiagnosticsElementsCache.java
+1 -2
View File
@@ -14,14 +14,13 @@
* limitations under the License.
*/
package org.jetbrains.jet.lang.resolve;
package org.jetbrains.jet.lang.resolve.diagnostics;
import com.intellij.openapi.util.AtomicNotNullLazyValue;
import com.intellij.psi.PsiElement;
import com.intellij.util.containers.ConcurrentMultiMap;
import com.intellij.util.containers.MultiMap;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.lang.diagnostics.Diagnostic;
import java.util.Collection;
compiler/frontend/src/org/jetbrains/jet/lang/resolve/DiagnosticsWithSuppression.java → compiler/frontend/src/org/jetbrains/jet/lang/resolve/diagnostics/DiagnosticsWithSuppression.java
+2 -1
View File
@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.jetbrains.jet.lang.resolve;
package org.jetbrains.jet.lang.resolve.diagnostics;
import com.google.common.collect.ImmutableSet;
import com.intellij.openapi.application.Application;
@@ -36,6 +36,7 @@ import org.jetbrains.jet.lang.diagnostics.Severity;
import org.jetbrains.jet.lang.psi.JetAnnotated;
import org.jetbrains.jet.lang.psi.JetAnnotationEntry;
import org.jetbrains.jet.lang.psi.JetStubbedPsiUtil;
import org.jetbrains.jet.lang.resolve.BindingContext;
import org.jetbrains.jet.lang.resolve.constants.ArrayValue;
import org.jetbrains.jet.lang.resolve.constants.CompileTimeConstant;
import org.jetbrains.jet.lang.resolve.constants.StringValue;
compiler/frontend/src/org/jetbrains/jet/lang/resolve/MutableDiagnosticsWithSuppression.kt → compiler/frontend/src/org/jetbrains/jet/lang/resolve/diagnostics/MutableDiagnosticsWithSuppression.kt
+2 -1
View File
@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.jetbrains.jet.lang.resolve
package org.jetbrains.jet.lang.resolve.diagnostics
import org.jetbrains.jet.lang.diagnostics.Diagnostic
import java.util.ArrayList
@@ -23,6 +23,7 @@ import com.intellij.util.CachedValueImpl
import com.intellij.psi.util.CachedValueProvider
import com.intellij.psi.PsiElement
import org.jetbrains.annotations.TestOnly
import org.jetbrains.jet.lang.resolve.BindingContext
public class MutableDiagnosticsWithSuppression(
private val bindingContext: BindingContext,
compiler/frontend/src/org/jetbrains/jet/lang/resolve/SimpleDiagnostics.kt → compiler/frontend/src/org/jetbrains/jet/lang/resolve/diagnostics/SimpleDiagnostics.kt
+1 -1
View File
@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.jetbrains.jet.lang.resolve
package org.jetbrains.jet.lang.resolve.diagnostics
import com.intellij.psi.PsiElement
import org.jetbrains.jet.lang.diagnostics.Diagnostic
compiler/frontend/src/org/jetbrains/jet/storage/LockBasedLazyResolveStorageManager.kt
+1 -1
View File
@@ -21,9 +21,9 @@ import org.jetbrains.annotations.TestOnly
import org.jetbrains.jet.lang.diagnostics.Diagnostic
import org.jetbrains.jet.lang.resolve.BindingContext
import org.jetbrains.jet.lang.resolve.BindingTrace
import org.jetbrains.jet.lang.resolve.Diagnostics
import org.jetbrains.jet.util.slicedmap.ReadOnlySlice
import org.jetbrains.jet.util.slicedmap.WritableSlice
import org.jetbrains.jet.lang.resolve.diagnostics.Diagnostics
public class LockBasedLazyResolveStorageManager(private val storageManager: StorageManager): StorageManager by storageManager, LazyResolveStorageManager {
override fun <K, V> createWeaklyRetainedMemoizedFunction(compute: Function1<K, V>) =
compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinJavaFileStubProvider.java
+1 -1
View File
@@ -54,7 +54,7 @@ import org.jetbrains.jet.lang.psi.JetPsiUtil;
import org.jetbrains.jet.lang.psi.JetScript;
import org.jetbrains.jet.lang.resolve.BindingContext;
import org.jetbrains.jet.lang.resolve.BindingTraceContext;
import org.jetbrains.jet.lang.resolve.Diagnostics;
import org.jetbrains.jet.lang.resolve.diagnostics.Diagnostics;
import org.jetbrains.jet.lang.resolve.java.JvmClassName;
import org.jetbrains.jet.lang.resolve.name.FqName;
import org.jetbrains.org.objectweb.asm.Type;
compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/LightClassStubWithData.kt
+1 -1
View File
@@ -19,7 +19,7 @@ package org.jetbrains.jet.asJava
import com.intellij.psi.impl.java.stubs.PsiJavaFileStub
import org.jetbrains.jet.lang.descriptors.ClassDescriptor
import org.jetbrains.jet.lang.psi.JetClassOrObject
import org.jetbrains.jet.lang.resolve.Diagnostics
import org.jetbrains.jet.lang.resolve.diagnostics.Diagnostics
import org.jetbrains.jet.lang.resolve.name.FqName
trait LightClassData
compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/duplicateJvmSignatureUtil.kt
+1 -1
View File
@@ -17,7 +17,7 @@
package org.jetbrains.jet.asJava
import com.intellij.psi.PsiElement
import org.jetbrains.jet.lang.resolve.Diagnostics
import org.jetbrains.jet.lang.resolve.diagnostics.Diagnostics
import org.jetbrains.jet.lang.psi.JetFile
import org.jetbrains.jet.lang.psi.JetClassBody
import org.jetbrains.jet.lang.psi.JetClassOrObject
compiler/tests/org/jetbrains/jet/JetTestUtils.java
+1 -2
View File
@@ -48,7 +48,6 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.annotations.TestOnly;
import org.jetbrains.jet.analyzer.AnalysisResult;
import org.jetbrains.jet.cli.jvm.compiler.CliLightClassGenerationSupport;
import org.jetbrains.jet.cli.jvm.compiler.EnvironmentConfigFiles;
import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment;
import org.jetbrains.jet.codegen.forTestCompile.ForTestCompileRuntime;
@@ -63,8 +62,8 @@ import org.jetbrains.jet.lang.diagnostics.rendering.DefaultErrorMessages;
import org.jetbrains.jet.lang.psi.JetFile;
import org.jetbrains.jet.lang.resolve.BindingContext;
import org.jetbrains.jet.lang.resolve.BindingTrace;
import org.jetbrains.jet.lang.resolve.Diagnostics;
import org.jetbrains.jet.lang.resolve.ImportPath;
import org.jetbrains.jet.lang.resolve.diagnostics.Diagnostics;
import org.jetbrains.jet.lang.resolve.lazy.JvmResolveUtil;
import org.jetbrains.jet.lang.resolve.lazy.LazyResolveTestUtil;
import org.jetbrains.jet.lang.resolve.name.Name;
compiler/tests/org/jetbrains/jet/checkers/AbstractJetDiagnosticsTest.java
+1 -1
View File
@@ -42,7 +42,7 @@ import org.jetbrains.jet.lang.psi.JetFile;
import org.jetbrains.jet.lang.resolve.AnalyzingUtils;
import org.jetbrains.jet.lang.resolve.BindingContext;
import org.jetbrains.jet.lang.resolve.BindingTrace;
import org.jetbrains.jet.lang.resolve.Diagnostics;
import org.jetbrains.jet.lang.resolve.diagnostics.Diagnostics;
import org.jetbrains.jet.lang.resolve.calls.model.MutableResolvedCall;
import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall;
import org.jetbrains.jet.lang.resolve.java.TopDownAnalyzerFacadeForJVM;
compiler/tests/org/jetbrains/jet/checkers/BaseDiagnosticsTest.java
+1 -1
View File
@@ -38,7 +38,7 @@ import org.jetbrains.jet.lang.diagnostics.*;
import org.jetbrains.jet.lang.psi.JetDeclaration;
import org.jetbrains.jet.lang.psi.JetFile;
import org.jetbrains.jet.lang.resolve.BindingContext;
import org.jetbrains.jet.lang.resolve.Diagnostics;
import org.jetbrains.jet.lang.resolve.diagnostics.Diagnostics;
import org.jetbrains.jet.lang.types.Flexibility;
import org.junit.Assert;
compiler/tests/org/jetbrains/jet/resolve/MutableDiagnosticsTest.kt
+2 -2
View File
@@ -25,8 +25,8 @@ import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment
import org.jetbrains.jet.lang.resolve.lazy.KotlinTestWithEnvironment
import org.jetbrains.jet.config.CompilerConfiguration
import org.jetbrains.jet.lang.resolve.BindingTrace
import org.jetbrains.jet.lang.resolve.Diagnostics
import org.jetbrains.jet.lang.resolve.MutableDiagnosticsWithSuppression
import org.jetbrains.jet.lang.resolve.diagnostics.Diagnostics
import org.jetbrains.jet.lang.resolve.diagnostics.MutableDiagnosticsWithSuppression
import org.jetbrains.jet.cli.jvm.compiler.EnvironmentConfigFiles
class MutableDiagnosticsTest : KotlinTestWithEnvironment() {
idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/DuplicateJvmSignatureAnnotator.java
+1 -1
View File
@@ -26,7 +26,7 @@ import org.jetbrains.jet.asJava.AsJavaPackage;
import org.jetbrains.jet.lang.psi.JetDeclaration;
import org.jetbrains.jet.lang.psi.JetElement;
import org.jetbrains.jet.lang.psi.JetFile;
import org.jetbrains.jet.lang.resolve.Diagnostics;
import org.jetbrains.jet.lang.resolve.diagnostics.Diagnostics;
import org.jetbrains.jet.plugin.util.ProjectRootsUtil;
import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage;
import org.jetbrains.jet.plugin.project.TargetPlatform;
idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/JetPsiChecker.kt
+1 -1
View File
@@ -42,7 +42,7 @@ import org.jetbrains.jet.lang.psi.JetCodeFragment
import org.jetbrains.jet.lang.psi.JetFile
import org.jetbrains.jet.lang.psi.JetReferenceExpression
import org.jetbrains.jet.lang.resolve.BindingContext
import org.jetbrains.jet.lang.resolve.Diagnostics
import org.jetbrains.jet.lang.resolve.diagnostics.Diagnostics
import org.jetbrains.jet.plugin.util.ProjectRootsUtil
import org.jetbrains.jet.plugin.actions.internal.KotlinInternalMode
import org.jetbrains.jet.plugin.caches.resolve.*
idea/src/META-INF/extensions/common.xml
+2 -2
View File
@@ -5,8 +5,8 @@
<extensionPoint name="defaultErrorMessages"
interface="org.jetbrains.jet.lang.diagnostics.rendering.DefaultErrorMessages$Extension"/>
<extensionPoint name="suppressStringProvider"
interface="org.jetbrains.jet.lang.resolve.DiagnosticsWithSuppression$SuppressStringProvider"/>
interface="org.jetbrains.jet.lang.resolve.diagnostics.DiagnosticsWithSuppression$SuppressStringProvider"/>
<extensionPoint name="diagnosticSuppressor"
interface="org.jetbrains.jet.lang.resolve.DiagnosticsWithSuppression$DiagnosticSuppressor"/>
interface="org.jetbrains.jet.lang.resolve.diagnostics.DiagnosticsWithSuppression$DiagnosticSuppressor"/>
</extensionPoints>
</idea-plugin>
idea/src/org/jetbrains/jet/plugin/debugger/DiagnosticSuppressorForDebugger.kt
+1 -1
View File
@@ -16,7 +16,7 @@
package org.jetbrains.jet.plugin.debugger
import org.jetbrains.jet.lang.resolve.DiagnosticsWithSuppression
import org.jetbrains.jet.lang.resolve.diagnostics.DiagnosticsWithSuppression
import org.jetbrains.jet.lang.diagnostics.Diagnostic
import org.jetbrains.jet.lang.psi.JetFile
import org.jetbrains.jet.lang.diagnostics.Errors
js/js.frontend/src/org/jetbrains/k2js/analyze/suppressWarnings.kt
+1 -1
View File
@@ -19,7 +19,7 @@ package org.jetbrains.k2js.analyze
import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor
import org.jetbrains.jet.lang.resolve.DescriptorUtils
import org.jetbrains.jet.lang.diagnostics.Errors
import org.jetbrains.jet.lang.resolve.DiagnosticsWithSuppression
import org.jetbrains.jet.lang.resolve.diagnostics.DiagnosticsWithSuppression
import org.jetbrains.k2js.PredefinedAnnotation
import org.jetbrains.jet.lang.diagnostics.Diagnostic
import org.jetbrains.jet.lang.diagnostics.Severity
js/js.translator/src/org/jetbrains/k2js/facade/K2JSTranslator.java
+1 -1
View File
@@ -38,7 +38,7 @@ import org.jetbrains.jet.analyzer.AnalysisResult;
import org.jetbrains.jet.lang.descriptors.ModuleDescriptor;
import org.jetbrains.jet.lang.psi.JetFile;
import org.jetbrains.jet.lang.resolve.BindingContext;
import org.jetbrains.jet.lang.resolve.Diagnostics;
import org.jetbrains.jet.lang.resolve.diagnostics.Diagnostics;
import org.jetbrains.jet.utils.fileUtils.FileUtilsPackage;
import org.jetbrains.js.compiler.JsSourceGenerationVisitor;
import org.jetbrains.js.compiler.sourcemap.SourceMap3Builder;