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

Rename: JetElement#getBindingContext() -> analyzeFully

Browse Source
This commit is contained in:
Pavel V. Talanov
2014-11-20 18:27:00 +03:00
parent d06628945c
commit 1cf3938f13
39 changed files with 51 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/KotlinResolveCache.kt
+1 -1
View File
@@ -292,7 +292,7 @@ private object KotlinResolveDataProvider {
else {
if (contextElement !is JetExpression) return BindingContext.EMPTY
val contextForElement = contextElement.getBindingContext()
val contextForElement = contextElement.analyzeFully()
scopeForContextElement = contextForElement[BindingContext.RESOLUTION_SCOPE, contextElement]
dataFlowInfo = contextForElement.getDataFlowInfo(contextElement)
idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/resolutionApi.kt
+1 -1
View File
@@ -49,7 +49,7 @@ public fun JetElement.getAnalysisResults(vararg extraFiles: JetFile): AnalysisRe
return KotlinCacheService.getInstance(getProject()).getAnalysisResults(listOf(this) + extraFiles.toList())
}
public fun JetElement.getBindingContext(): BindingContext {
public fun JetElement.analyzeFully(): BindingContext {
return getAnalysisResults().bindingContext
}
idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/DebugInfoAnnotator.java
+1 -1
View File
@@ -48,7 +48,7 @@ public class DebugInfoAnnotator implements Annotator {
if (element instanceof JetFile && !(element instanceof JetCodeFragment)) {
JetFile file = (JetFile) element;
try {
BindingContext bindingContext = ResolvePackage.getBindingContext(file);
BindingContext bindingContext = ResolvePackage.analyzeFully(file);
DebugInfoUtil.markDebugAnnotations(file, bindingContext, new DebugInfoUtil.DebugInfoReporter() {
@Override
public void reportElementWithErrorType(@NotNull JetReferenceExpression expression) {
idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/DuplicateJvmSignatureAnnotator.java
+1 -1
View File
@@ -44,7 +44,7 @@ public class DuplicateJvmSignatureAnnotator implements Annotator {
PsiFile file = element.getContainingFile();
if (!(file instanceof JetFile) || TargetPlatformDetector.getPlatform((JetFile) file) != TargetPlatform.JVM) return;
Diagnostics otherDiagnostics = ResolvePackage.getBindingContext((JetElement) element).getDiagnostics();
Diagnostics otherDiagnostics = ResolvePackage.analyzeFully((JetElement) element).getDiagnostics();
GlobalSearchScope moduleScope = getModuleInfo(element).contentScope();
Diagnostics diagnostics = AsJavaPackage.getJvmSignatureDiagnostics(element, otherDiagnostics, moduleScope);