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

BuiltinsScopeExtensionMode not needed any more

Browse Source 
(see the changes in DefaultModuleConfiguration.java)
This commit is contained in:
Andrey Breslav
2012-10-17 12:19:07 +04:00
parent 69f44dec62
commit 937c4e8baf
32 changed files with 55 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/codeInsight/ktSignature/AddKotlinSignatureAnnotation.java
+1 -2
View File
@@ -33,7 +33,6 @@ import com.intellij.util.messages.MessageBusConnection;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.di.InjectorForJavaSemanticServices;
import org.jetbrains.jet.lang.BuiltinsScopeExtensionMode;
import org.jetbrains.jet.lang.descriptors.*;
import org.jetbrains.jet.lang.resolve.BindingContext;
import org.jetbrains.jet.lang.resolve.java.JavaDescriptorResolver;
@@ -164,7 +163,7 @@ public class AddKotlinSignatureAnnotation extends BaseIntentionAction implements
@NotNull
private static String getDefaultSignature(@NotNull Project project, @NotNull PsiMember psiMember) {
InjectorForJavaSemanticServices injector = new InjectorForJavaSemanticServices(BuiltinsScopeExtensionMode.ALL, project);
InjectorForJavaSemanticServices injector = new InjectorForJavaSemanticServices(project);
JavaDescriptorResolver javaDescriptorResolver = injector.getJavaDescriptorResolver();
PsiClass containingClass = psiMember.getContainingClass();
idea/src/org/jetbrains/jet/plugin/libraries/DecompiledDataFactory.java
+1 -2
View File
@@ -27,7 +27,6 @@ import jet.runtime.typeinfo.JetClass;
import jet.runtime.typeinfo.JetMethod;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.di.InjectorForJavaSemanticServices;
import org.jetbrains.jet.lang.BuiltinsScopeExtensionMode;
import org.jetbrains.jet.lang.descriptors.*;
import org.jetbrains.jet.lang.psi.JetDeclaration;
import org.jetbrains.jet.lang.psi.JetFile;
@@ -61,7 +60,7 @@ class DecompiledDataFactory {
private DecompiledDataFactory(ClsFileImpl clsFile) {
this.clsFile = clsFile;
Project project = this.clsFile.getProject();
InjectorForJavaSemanticServices injector = new InjectorForJavaSemanticServices(BuiltinsScopeExtensionMode.ALL, project);
InjectorForJavaSemanticServices injector = new InjectorForJavaSemanticServices(project);
bindingContext = injector.getBindingTrace().getBindingContext();
javaDescriptorResolver = injector.getJavaDescriptorResolver();
}