Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
硅谷海盗
kotlin
提交
dfbd9922
K
kotlin
项目概览
硅谷海盗
/
kotlin
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
K
kotlin
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
dfbd9922
编写于
5月 28, 2012
作者:
S
Svetlana Isakova
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fixes after merge
get rid of JetControlFlowDataTraceFactory
上级
a79ea0c8
变更
11
隐藏空白更改
内联
并排
Showing
11 changed file
with
104 addition
and
75 deletion
+104
-75
.idea/inspectionProfiles/idea_default.xml
.idea/inspectionProfiles/idea_default.xml
+3
-0
.idea/runConfigurations/Js_backend_tests.xml
.idea/runConfigurations/Js_backend_tests.xml
+1
-3
compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJvm.java
...rg/jetbrains/jet/di/InjectorForTopDownAnalyzerForJvm.java
+32
-10
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/AnalyzerFacadeForJVM.java
...jetbrains/jet/lang/resolve/java/AnalyzerFacadeForJVM.java
+11
-24
compiler/frontend/src/org/jetbrains/jet/analyzer/AnalyzerFacade.java
...ontend/src/org/jetbrains/jet/analyzer/AnalyzerFacade.java
+1
-4
compiler/frontend/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerBasic.java
...org/jetbrains/jet/di/InjectorForTopDownAnalyzerBasic.java
+26
-10
idea/src/org/jetbrains/jet/plugin/project/AnalyzerFacadeWithCache.java
...jetbrains/jet/plugin/project/AnalyzerFacadeWithCache.java
+1
-4
idea/src/org/jetbrains/jet/plugin/project/JSAnalyzerFacadeForIDEA.java
...jetbrains/jet/plugin/project/JSAnalyzerFacadeForIDEA.java
+1
-4
idea/src/org/jetbrains/jet/plugin/refactoring/introduceVariable/JetIntroduceVariableHandler.java
...toring/introduceVariable/JetIntroduceVariableHandler.java
+0
-1
js/js.translator/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJs.java
...org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJs.java
+26
-10
js/js.translator/src/org/jetbrains/k2js/analyze/AnalyzerFacadeForJS.java
...r/src/org/jetbrains/k2js/analyze/AnalyzerFacadeForJS.java
+2
-5
未找到文件。
.idea/inspectionProfiles/idea_default.xml
浏览文件 @
dfbd9922
...
...
@@ -410,6 +410,9 @@
<inspection_tool
class=
"UtilityClassWithPublicConstructor"
enabled=
"true"
level=
"WARNING"
enabled_by_default=
"true"
/>
<inspection_tool
class=
"UtilityClassWithoutPrivateConstructor"
enabled=
"true"
level=
"WARNING"
enabled_by_default=
"true"
>
<option
name=
"ignoreClassesWithOnlyMain"
value=
"false"
/>
<option
name=
"ignorableAnnotations"
>
<value
/>
</option>
</inspection_tool>
<inspection_tool
class=
"VolatileLongOrDoubleField"
enabled=
"true"
level=
"WARNING"
enabled_by_default=
"true"
/>
<inspection_tool
class=
"WaitNotInLoop"
enabled=
"true"
level=
"WARNING"
enabled_by_default=
"true"
/>
...
...
.idea/runConfigurations/Js_backend_tests.xml
浏览文件 @
dfbd9922
...
...
@@ -26,8 +26,6 @@
<RunnerSettings
RunnerId=
"Run"
/>
<ConfigurationWrapper
RunnerId=
"Debug"
/>
<ConfigurationWrapper
RunnerId=
"Run"
/>
<method>
<option
name=
"AntTarget"
enabled=
"false"
antfile=
"file://$PROJECT_DIR$/js_backend_tests.xml"
target=
"copy_lib"
/>
</method>
<method
/>
</configuration>
</component>
\ No newline at end of file
compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJvm.java
浏览文件 @
dfbd9922
...
...
@@ -17,16 +17,42 @@
package
org.jetbrains.jet.di
;
import
org.jetbrains.jet.lang.resolve.TopDownAnalyzer
;
import
org.jetbrains.jet.lang.resolve.TopDownAnalysisContext
;
import
org.jetbrains.jet.lang.resolve.BodyResolver
;
import
org.jetbrains.jet.lang.resolve.ControlFlowAnalyzer
;
import
org.jetbrains.jet.lang.resolve.DeclarationsChecker
;
import
org.jetbrains.jet.lang.resolve.DescriptorResolver
;
import
com.intellij.openapi.project.Project
;
import
org.jetbrains.
annotations.NotNull
;
import
org.jetbrains.jet.lang.
cfg.pseudocode.JetControlFlowDataTraceFactory
;
import
org.jetbrains.
jet.lang.resolve.TopDownAnalysisParameters
;
import
org.jetbrains.jet.lang.
resolve.ObservableBindingTrace
;
import
org.jetbrains.jet.lang.descriptors.ModuleDescriptor
;
import
org.jetbrains.jet.lang.resolve.*
;
import
org.jetbrains.jet.lang.resolve.java.CompilerDependencies
;
import
org.jetbrains.jet.lang.resolve.java.CompilerSpecialMode
;
import
org.jetbrains.jet.lang.resolve.java.JavaBridgeConfiguration
;
import
org.jetbrains.jet.lang.resolve.java.PsiClassFinderForJvm
;
import
org.jetbrains.jet.lang.resolve.DeclarationResolver
;
import
org.jetbrains.jet.lang.resolve.AnnotationResolver
;
import
org.jetbrains.jet.lang.resolve.calls.CallResolver
;
import
org.jetbrains.jet.lang.resolve.calls.OverloadingConflictResolver
;
import
org.jetbrains.jet.lang.resolve.java.*
;
import
org.jetbrains.jet.lang.types.expressions.ExpressionTypingServices
;
import
org.jetbrains.jet.lang.resolve.TypeResolver
;
import
org.jetbrains.jet.lang.resolve.QualifiedExpressionResolver
;
import
org.jetbrains.jet.lang.resolve.calls.OverloadingConflictResolver
;
import
org.jetbrains.jet.lang.resolve.ImportsResolver
;
import
org.jetbrains.jet.lang.resolve.DelegationResolver
;
import
org.jetbrains.jet.lang.resolve.NamespaceFactoryImpl
;
import
org.jetbrains.jet.lang.resolve.OverloadResolver
;
import
org.jetbrains.jet.lang.resolve.OverrideResolver
;
import
org.jetbrains.jet.lang.resolve.TypeHierarchyResolver
;
import
org.jetbrains.jet.lang.resolve.java.JavaSemanticServices
;
import
org.jetbrains.jet.lang.resolve.java.JavaDescriptorResolver
;
import
org.jetbrains.jet.lang.resolve.java.JavaTypeTransformer
;
import
com.intellij.openapi.project.Project
;
import
org.jetbrains.jet.lang.resolve.TopDownAnalysisParameters
;
import
org.jetbrains.jet.lang.resolve.ObservableBindingTrace
;
import
org.jetbrains.jet.lang.descriptors.ModuleDescriptor
;
import
org.jetbrains.jet.lang.resolve.java.CompilerDependencies
;
import
org.jetbrains.annotations.NotNull
;
import
javax.annotation.PreDestroy
;
/* This file is generated by org.jetbrains.jet.di.AllInjectorsGenerator. DO NOT EDIT! */
...
...
@@ -42,7 +68,6 @@ public class InjectorForTopDownAnalyzerForJvm {
private
final
TopDownAnalysisParameters
topDownAnalysisParameters
;
private
final
ObservableBindingTrace
observableBindingTrace
;
private
final
ModuleDescriptor
moduleDescriptor
;
private
final
JetControlFlowDataTraceFactory
jetControlFlowDataTraceFactory
;
private
final
CompilerDependencies
compilerDependencies
;
private
CompilerSpecialMode
compilerSpecialMode
;
private
JavaBridgeConfiguration
javaBridgeConfiguration
;
...
...
@@ -69,7 +94,6 @@ public class InjectorForTopDownAnalyzerForJvm {
@NotNull
TopDownAnalysisParameters
topDownAnalysisParameters
,
@NotNull
ObservableBindingTrace
observableBindingTrace
,
@NotNull
ModuleDescriptor
moduleDescriptor
,
JetControlFlowDataTraceFactory
jetControlFlowDataTraceFactory
,
@NotNull
CompilerDependencies
compilerDependencies
)
{
this
.
topDownAnalyzer
=
new
TopDownAnalyzer
();
...
...
@@ -82,7 +106,6 @@ public class InjectorForTopDownAnalyzerForJvm {
this
.
topDownAnalysisParameters
=
topDownAnalysisParameters
;
this
.
observableBindingTrace
=
observableBindingTrace
;
this
.
moduleDescriptor
=
moduleDescriptor
;
this
.
jetControlFlowDataTraceFactory
=
jetControlFlowDataTraceFactory
;
this
.
compilerDependencies
=
compilerDependencies
;
this
.
compilerSpecialMode
=
compilerDependencies
.
getCompilerSpecialMode
();
this
.
javaBridgeConfiguration
=
new
JavaBridgeConfiguration
();
...
...
@@ -126,7 +149,6 @@ public class InjectorForTopDownAnalyzerForJvm {
this
.
bodyResolver
.
setTopDownAnalysisParameters
(
topDownAnalysisParameters
);
this
.
bodyResolver
.
setTrace
(
observableBindingTrace
);
this
.
controlFlowAnalyzer
.
setFlowDataTraceFactory
(
jetControlFlowDataTraceFactory
);
this
.
controlFlowAnalyzer
.
setTopDownAnalysisParameters
(
topDownAnalysisParameters
);
this
.
controlFlowAnalyzer
.
setTrace
(
observableBindingTrace
);
...
...
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/AnalyzerFacadeForJVM.java
浏览文件 @
dfbd9922
...
...
@@ -24,7 +24,6 @@ import org.jetbrains.annotations.NotNull;
import
org.jetbrains.jet.analyzer.AnalyzeExhaust
;
import
org.jetbrains.jet.analyzer.AnalyzerFacade
;
import
org.jetbrains.jet.di.InjectorForTopDownAnalyzerForJvm
;
import
org.jetbrains.jet.lang.cfg.pseudocode.JetControlFlowDataTraceFactory
;
import
org.jetbrains.jet.lang.descriptors.ModuleDescriptor
;
import
org.jetbrains.jet.lang.psi.JetFile
;
import
org.jetbrains.jet.lang.resolve.*
;
...
...
@@ -50,9 +49,8 @@ public enum AnalyzerFacadeForJVM implements AnalyzerFacade {
@NotNull
public
AnalyzeExhaust
analyzeFiles
(
@NotNull
Project
project
,
@NotNull
Collection
<
JetFile
>
files
,
@NotNull
Predicate
<
PsiFile
>
filesToAnalyzeCompletely
,
@NotNull
JetControlFlowDataTraceFactory
flowDataTraceFactory
)
{
return
analyzeFilesWithJavaIntegration
(
project
,
files
,
filesToAnalyzeCompletely
,
flowDataTraceFactory
,
@NotNull
Predicate
<
PsiFile
>
filesToAnalyzeCompletely
)
{
return
analyzeFilesWithJavaIntegration
(
project
,
files
,
filesToAnalyzeCompletely
,
compilerDependenciesForProduction
(
CompilerSpecialMode
.
REGULAR
),
true
);
}
...
...
@@ -60,22 +58,19 @@ public enum AnalyzerFacadeForJVM implements AnalyzerFacade {
@Override
public
AnalyzeExhaust
analyzeBodiesInFiles
(
@NotNull
Project
project
,
@NotNull
Predicate
<
PsiFile
>
filesForBodiesResolve
,
@NotNull
JetControlFlowDataTraceFactory
flowDataTraceFactory
,
@NotNull
BindingTrace
headersTraceContext
,
@NotNull
BodiesResolveContext
bodiesResolveContext
)
{
return
analyzeBodiesInFilesWithJavaIntegration
(
project
,
filesForBodiesResolve
,
flowDataTraceFactory
,
compilerDependenciesForProduction
(
CompilerSpecialMode
.
REGULAR
),
project
,
filesForBodiesResolve
,
compilerDependenciesForProduction
(
CompilerSpecialMode
.
REGULAR
),
headersTraceContext
,
bodiesResolveContext
);
}
public
static
AnalyzeExhaust
analyzeOneFileWithJavaIntegrationAndCheckForErrors
(
JetFile
file
,
JetControlFlowDataTraceFactory
flowDataTraceFactory
,
@NotNull
CompilerDependencies
compilerDependencies
)
{
JetFile
file
,
@NotNull
CompilerDependencies
compilerDependencies
)
{
AnalyzingUtils
.
checkForSyntacticErrors
(
file
);
AnalyzeExhaust
analyzeExhaust
=
analyzeOneFileWithJavaIntegration
(
file
,
flowDataTraceFactory
,
compilerDependencies
);
AnalyzeExhaust
analyzeExhaust
=
analyzeOneFileWithJavaIntegration
(
file
,
compilerDependencies
);
AnalyzingUtils
.
throwExceptionOnErrors
(
analyzeExhaust
.
getBindingContext
());
...
...
@@ -83,24 +78,20 @@ public enum AnalyzerFacadeForJVM implements AnalyzerFacade {
}
public
static
AnalyzeExhaust
analyzeOneFileWithJavaIntegration
(
JetFile
file
,
JetControlFlowDataTraceFactory
flowDataTraceFactory
,
@NotNull
CompilerDependencies
compilerDependencies
)
{
JetFile
file
,
@NotNull
CompilerDependencies
compilerDependencies
)
{
return
analyzeFilesWithJavaIntegration
(
file
.
getProject
(),
Collections
.
singleton
(
file
),
Predicates
.<
PsiFile
>
alwaysTrue
(),
flowDataTraceFactory
,
compilerDependencies
);
Predicates
.<
PsiFile
>
alwaysTrue
(),
compilerDependencies
);
}
public
static
AnalyzeExhaust
analyzeFilesWithJavaIntegration
(
Project
project
,
Collection
<
JetFile
>
files
,
Predicate
<
PsiFile
>
filesToAnalyzeCompletely
,
JetControlFlowDataTraceFactory
flowDataTraceFactory
,
@NotNull
CompilerDependencies
compilerDependencies
)
{
return
analyzeFilesWithJavaIntegration
(
project
,
files
,
filesToAnalyzeCompletely
,
flowDataTraceFactory
,
compilerDependencies
,
false
);
project
,
files
,
filesToAnalyzeCompletely
,
compilerDependencies
,
false
);
}
public
static
AnalyzeExhaust
analyzeFilesWithJavaIntegration
(
Project
project
,
Collection
<
JetFile
>
files
,
Predicate
<
PsiFile
>
filesToAnalyzeCompletely
,
JetControlFlowDataTraceFactory
flowDataTraceFactory
,
@NotNull
CompilerDependencies
compilerDependencies
,
boolean
storeContextForBodiesResolve
)
{
BindingTraceContext
bindingTraceContext
=
new
BindingTraceContext
();
...
...
@@ -112,8 +103,7 @@ public enum AnalyzerFacadeForJVM implements AnalyzerFacade {
InjectorForTopDownAnalyzerForJvm
injector
=
new
InjectorForTopDownAnalyzerForJvm
(
project
,
topDownAnalysisParameters
,
new
ObservableBindingTrace
(
bindingTraceContext
),
owner
,
flowDataTraceFactory
,
compilerDependencies
);
new
ObservableBindingTrace
(
bindingTraceContext
),
owner
,
compilerDependencies
);
try
{
injector
.
getTopDownAnalyzer
().
analyzeFiles
(
files
);
BodiesResolveContext
bodiesResolveContext
=
storeContextForBodiesResolve
?
...
...
@@ -127,7 +117,6 @@ public enum AnalyzerFacadeForJVM implements AnalyzerFacade {
public
static
AnalyzeExhaust
analyzeBodiesInFilesWithJavaIntegration
(
Project
project
,
Predicate
<
PsiFile
>
filesToAnalyzeCompletely
,
JetControlFlowDataTraceFactory
flowDataTraceFactory
,
@NotNull
CompilerDependencies
compilerDependencies
,
@NotNull
BindingTrace
traceContext
,
@NotNull
BodiesResolveContext
bodiesResolveContext
)
{
...
...
@@ -140,8 +129,7 @@ public enum AnalyzerFacadeForJVM implements AnalyzerFacade {
InjectorForTopDownAnalyzerForJvm
injector
=
new
InjectorForTopDownAnalyzerForJvm
(
project
,
topDownAnalysisParameters
,
new
ObservableBindingTrace
(
traceContext
),
owner
,
flowDataTraceFactory
,
compilerDependencies
);
new
ObservableBindingTrace
(
traceContext
),
owner
,
compilerDependencies
);
try
{
injector
.
getTopDownAnalyzer
().
doProcessForBodies
(
bodiesResolveContext
);
...
...
@@ -157,7 +145,6 @@ public enum AnalyzerFacadeForJVM implements AnalyzerFacade {
Project
project
=
files
.
iterator
().
next
().
getProject
();
return
analyzeFilesWithJavaIntegration
(
project
,
files
,
Predicates
.<
PsiFile
>
alwaysFalse
(),
JetControlFlowDataTraceFactory
.
EMPTY
,
compilerDependencies
);
return
analyzeFilesWithJavaIntegration
(
project
,
files
,
Predicates
.<
PsiFile
>
alwaysFalse
(),
compilerDependencies
);
}
}
compiler/frontend/src/org/jetbrains/jet/analyzer/AnalyzerFacade.java
浏览文件 @
dfbd9922
...
...
@@ -20,7 +20,6 @@ import com.google.common.base.Predicate;
import
com.intellij.openapi.project.Project
;
import
com.intellij.psi.PsiFile
;
import
org.jetbrains.annotations.NotNull
;
import
org.jetbrains.jet.lang.cfg.pseudocode.JetControlFlowDataTraceFactory
;
import
org.jetbrains.jet.lang.psi.JetFile
;
import
org.jetbrains.jet.lang.resolve.BindingTrace
;
import
org.jetbrains.jet.lang.resolve.BodiesResolveContext
;
...
...
@@ -35,13 +34,11 @@ public interface AnalyzerFacade {
@NotNull
AnalyzeExhaust
analyzeFiles
(
@NotNull
Project
project
,
@NotNull
Collection
<
JetFile
>
files
,
@NotNull
Predicate
<
PsiFile
>
filesToAnalyzeCompletely
,
@NotNull
JetControlFlowDataTraceFactory
flowDataTraceFactory
);
@NotNull
Predicate
<
PsiFile
>
filesToAnalyzeCompletely
);
@NotNull
AnalyzeExhaust
analyzeBodiesInFiles
(
@NotNull
Project
project
,
@NotNull
Predicate
<
PsiFile
>
filesForBodiesResolve
,
@NotNull
JetControlFlowDataTraceFactory
flowDataTraceFactory
,
@NotNull
BindingTrace
traceContext
,
@NotNull
BodiesResolveContext
bodiesResolveContext
);
}
compiler/frontend/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerBasic.java
浏览文件 @
dfbd9922
...
...
@@ -17,16 +17,36 @@
package
org.jetbrains.jet.di
;
import
org.jetbrains.jet.lang.resolve.TopDownAnalyzer
;
import
org.jetbrains.jet.lang.resolve.TopDownAnalysisContext
;
import
org.jetbrains.jet.lang.resolve.BodyResolver
;
import
org.jetbrains.jet.lang.resolve.ControlFlowAnalyzer
;
import
org.jetbrains.jet.lang.resolve.DeclarationsChecker
;
import
org.jetbrains.jet.lang.resolve.DescriptorResolver
;
import
com.intellij.openapi.project.Project
;
import
org.jetbrains.annotations.NotNull
;
import
org.jetbrains.jet.lang.ModuleConfiguration
;
import
org.jetbrains.jet.lang.cfg.pseudocode.JetControlFlowDataTraceFactory
;
import
org.jetbrains.jet.lang.resolve.TopDownAnalysisParameters
;
import
org.jetbrains.jet.lang.resolve.ObservableBindingTrace
;
import
org.jetbrains.jet.lang.descriptors.ModuleDescriptor
;
import
org.jetbrains.jet.lang.resolve.*
;
import
org.jetbrains.jet.lang.ModuleConfiguration
;
import
org.jetbrains.jet.lang.resolve.DeclarationResolver
;
import
org.jetbrains.jet.lang.resolve.AnnotationResolver
;
import
org.jetbrains.jet.lang.resolve.calls.CallResolver
;
import
org.jetbrains.jet.lang.resolve.calls.OverloadingConflictResolver
;
import
org.jetbrains.jet.lang.types.expressions.ExpressionTypingServices
;
import
org.jetbrains.jet.lang.resolve.TypeResolver
;
import
org.jetbrains.jet.lang.resolve.QualifiedExpressionResolver
;
import
org.jetbrains.jet.lang.resolve.calls.OverloadingConflictResolver
;
import
org.jetbrains.jet.lang.resolve.ImportsResolver
;
import
org.jetbrains.jet.lang.resolve.DelegationResolver
;
import
org.jetbrains.jet.lang.resolve.NamespaceFactoryImpl
;
import
org.jetbrains.jet.lang.resolve.OverloadResolver
;
import
org.jetbrains.jet.lang.resolve.OverrideResolver
;
import
org.jetbrains.jet.lang.resolve.TypeHierarchyResolver
;
import
com.intellij.openapi.project.Project
;
import
org.jetbrains.jet.lang.resolve.TopDownAnalysisParameters
;
import
org.jetbrains.jet.lang.resolve.ObservableBindingTrace
;
import
org.jetbrains.jet.lang.descriptors.ModuleDescriptor
;
import
org.jetbrains.jet.lang.ModuleConfiguration
;
import
org.jetbrains.annotations.NotNull
;
import
javax.annotation.PreDestroy
;
/* This file is generated by org.jetbrains.jet.di.AllInjectorsGenerator. DO NOT EDIT! */
...
...
@@ -42,7 +62,6 @@ public class InjectorForTopDownAnalyzerBasic {
private
final
TopDownAnalysisParameters
topDownAnalysisParameters
;
private
final
ObservableBindingTrace
observableBindingTrace
;
private
final
ModuleDescriptor
moduleDescriptor
;
private
final
JetControlFlowDataTraceFactory
jetControlFlowDataTraceFactory
;
private
final
ModuleConfiguration
moduleConfiguration
;
private
DeclarationResolver
declarationResolver
;
private
AnnotationResolver
annotationResolver
;
...
...
@@ -63,7 +82,6 @@ public class InjectorForTopDownAnalyzerBasic {
@NotNull
TopDownAnalysisParameters
topDownAnalysisParameters
,
@NotNull
ObservableBindingTrace
observableBindingTrace
,
@NotNull
ModuleDescriptor
moduleDescriptor
,
JetControlFlowDataTraceFactory
jetControlFlowDataTraceFactory
,
@NotNull
ModuleConfiguration
moduleConfiguration
)
{
this
.
topDownAnalyzer
=
new
TopDownAnalyzer
();
...
...
@@ -76,7 +94,6 @@ public class InjectorForTopDownAnalyzerBasic {
this
.
topDownAnalysisParameters
=
topDownAnalysisParameters
;
this
.
observableBindingTrace
=
observableBindingTrace
;
this
.
moduleDescriptor
=
moduleDescriptor
;
this
.
jetControlFlowDataTraceFactory
=
jetControlFlowDataTraceFactory
;
this
.
moduleConfiguration
=
moduleConfiguration
;
this
.
declarationResolver
=
new
DeclarationResolver
();
this
.
annotationResolver
=
new
AnnotationResolver
();
...
...
@@ -114,7 +131,6 @@ public class InjectorForTopDownAnalyzerBasic {
this
.
bodyResolver
.
setTopDownAnalysisParameters
(
topDownAnalysisParameters
);
this
.
bodyResolver
.
setTrace
(
observableBindingTrace
);
this
.
controlFlowAnalyzer
.
setFlowDataTraceFactory
(
jetControlFlowDataTraceFactory
);
this
.
controlFlowAnalyzer
.
setTopDownAnalysisParameters
(
topDownAnalysisParameters
);
this
.
controlFlowAnalyzer
.
setTrace
(
observableBindingTrace
);
...
...
idea/src/org/jetbrains/jet/plugin/project/AnalyzerFacadeWithCache.java
浏览文件 @
dfbd9922
...
...
@@ -28,7 +28,6 @@ import com.intellij.psi.util.PsiModificationTracker;
import
com.intellij.util.Function
;
import
org.jetbrains.annotations.NotNull
;
import
org.jetbrains.jet.analyzer.AnalyzeExhaust
;
import
org.jetbrains.jet.lang.cfg.pseudocode.JetControlFlowDataTraceFactory
;
import
org.jetbrains.jet.lang.diagnostics.DiagnosticUtils
;
import
org.jetbrains.jet.lang.diagnostics.Errors
;
import
org.jetbrains.jet.lang.psi.JetFile
;
...
...
@@ -94,7 +93,6 @@ public final class AnalyzerFacadeWithCache {
AnalyzeExhaust
exhaust
=
AnalyzerFacadeProvider
.
getAnalyzerFacadeForFile
(
file
).
analyzeBodiesInFiles
(
file
.
getProject
(),
Predicates
.<
PsiFile
>
equalTo
(
file
),
JetControlFlowDataTraceFactory
.
EMPTY
,
new
DelegatingBindingTrace
(
analyzeExhaustHeaders
.
getBindingContext
()),
context
);
...
...
@@ -137,8 +135,7 @@ public final class AnalyzerFacadeWithCache {
AnalyzeExhaust
exhaust
=
AnalyzerFacadeProvider
.
getAnalyzerFacadeForFile
(
fileToCache
)
.
analyzeFiles
(
fileToCache
.
getProject
(),
headerFiles
,
Predicates
.<
PsiFile
>
alwaysFalse
(),
JetControlFlowDataTraceFactory
.
EMPTY
);
Predicates
.<
PsiFile
>
alwaysFalse
());
return
new
Result
<
AnalyzeExhaust
>(
exhaust
,
PsiModificationTracker
.
OUT_OF_CODE_BLOCK_MODIFICATION_COUNT
);
}
...
...
idea/src/org/jetbrains/jet/plugin/project/JSAnalyzerFacadeForIDEA.java
浏览文件 @
dfbd9922
...
...
@@ -22,7 +22,6 @@ import com.intellij.psi.PsiFile;
import
org.jetbrains.annotations.NotNull
;
import
org.jetbrains.jet.analyzer.AnalyzeExhaust
;
import
org.jetbrains.jet.analyzer.AnalyzerFacade
;
import
org.jetbrains.jet.lang.cfg.pseudocode.JetControlFlowDataTraceFactory
;
import
org.jetbrains.jet.lang.psi.JetFile
;
import
org.jetbrains.jet.lang.resolve.BindingTrace
;
import
org.jetbrains.jet.lang.resolve.BodiesResolveContext
;
...
...
@@ -44,8 +43,7 @@ public enum JSAnalyzerFacadeForIDEA implements AnalyzerFacade {
@Override
public
AnalyzeExhaust
analyzeFiles
(
@NotNull
Project
project
,
@NotNull
Collection
<
JetFile
>
files
,
@NotNull
Predicate
<
PsiFile
>
filesToAnalyzeCompletely
,
@NotNull
JetControlFlowDataTraceFactory
flowDataTraceFactory
)
{
@NotNull
Predicate
<
PsiFile
>
filesToAnalyzeCompletely
)
{
return
AnalyzerFacadeForJS
.
analyzeFiles
(
files
,
filesToAnalyzeCompletely
,
new
IDEAConfig
(
project
),
true
);
}
...
...
@@ -53,7 +51,6 @@ public enum JSAnalyzerFacadeForIDEA implements AnalyzerFacade {
@Override
public
AnalyzeExhaust
analyzeBodiesInFiles
(
@NotNull
Project
project
,
@NotNull
Predicate
<
PsiFile
>
filesForBodiesResolve
,
@NotNull
JetControlFlowDataTraceFactory
flowDataTraceFactory
,
@NotNull
BindingTrace
traceContext
,
@NotNull
BodiesResolveContext
bodiesResolveContext
)
{
return
AnalyzerFacadeForJS
.
analyzeBodiesInFiles
(
filesForBodiesResolve
,
new
IDEAConfig
(
project
),
traceContext
,
bodiesResolveContext
);
...
...
idea/src/org/jetbrains/jet/plugin/refactoring/introduceVariable/JetIntroduceVariableHandler.java
浏览文件 @
dfbd9922
...
...
@@ -37,7 +37,6 @@ import org.jetbrains.annotations.NotNull;
import
org.jetbrains.annotations.Nullable
;
import
org.jetbrains.jet.di.InjectorForMacros
;
import
org.jetbrains.jet.di.InjectorForTopDownAnalyzerForJvm
;
import
org.jetbrains.jet.lang.cfg.pseudocode.JetControlFlowDataTraceFactory
;
import
org.jetbrains.jet.lang.descriptors.DeclarationDescriptor
;
import
org.jetbrains.jet.lang.descriptors.ModuleDescriptor
;
import
org.jetbrains.jet.lang.psi.*
;
...
...
js/js.translator/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJs.java
浏览文件 @
dfbd9922
...
...
@@ -17,16 +17,36 @@
package
org.jetbrains.jet.di
;
import
org.jetbrains.jet.lang.resolve.TopDownAnalyzer
;
import
org.jetbrains.jet.lang.resolve.TopDownAnalysisContext
;
import
org.jetbrains.jet.lang.resolve.BodyResolver
;
import
org.jetbrains.jet.lang.resolve.ControlFlowAnalyzer
;
import
org.jetbrains.jet.lang.resolve.DeclarationsChecker
;
import
org.jetbrains.jet.lang.resolve.DescriptorResolver
;
import
com.intellij.openapi.project.Project
;
import
org.jetbrains.annotations.NotNull
;
import
org.jetbrains.jet.lang.ModuleConfiguration
;
import
org.jetbrains.jet.lang.cfg.pseudocode.JetControlFlowDataTraceFactory
;
import
org.jetbrains.jet.lang.resolve.TopDownAnalysisParameters
;
import
org.jetbrains.jet.lang.resolve.ObservableBindingTrace
;
import
org.jetbrains.jet.lang.descriptors.ModuleDescriptor
;
import
org.jetbrains.jet.lang.resolve.*
;
import
org.jetbrains.jet.lang.ModuleConfiguration
;
import
org.jetbrains.jet.lang.resolve.DeclarationResolver
;
import
org.jetbrains.jet.lang.resolve.AnnotationResolver
;
import
org.jetbrains.jet.lang.resolve.calls.CallResolver
;
import
org.jetbrains.jet.lang.resolve.calls.OverloadingConflictResolver
;
import
org.jetbrains.jet.lang.types.expressions.ExpressionTypingServices
;
import
org.jetbrains.jet.lang.resolve.TypeResolver
;
import
org.jetbrains.jet.lang.resolve.QualifiedExpressionResolver
;
import
org.jetbrains.jet.lang.resolve.calls.OverloadingConflictResolver
;
import
org.jetbrains.jet.lang.resolve.ImportsResolver
;
import
org.jetbrains.jet.lang.resolve.DelegationResolver
;
import
org.jetbrains.jet.lang.resolve.NamespaceFactoryImpl
;
import
org.jetbrains.jet.lang.resolve.OverloadResolver
;
import
org.jetbrains.jet.lang.resolve.OverrideResolver
;
import
org.jetbrains.jet.lang.resolve.TypeHierarchyResolver
;
import
com.intellij.openapi.project.Project
;
import
org.jetbrains.jet.lang.resolve.TopDownAnalysisParameters
;
import
org.jetbrains.jet.lang.resolve.ObservableBindingTrace
;
import
org.jetbrains.jet.lang.descriptors.ModuleDescriptor
;
import
org.jetbrains.jet.lang.ModuleConfiguration
;
import
org.jetbrains.annotations.NotNull
;
import
javax.annotation.PreDestroy
;
/* This file is generated by org.jetbrains.jet.di.AllInjectorsGenerator. DO NOT EDIT! */
...
...
@@ -42,7 +62,6 @@ public class InjectorForTopDownAnalyzerForJs {
private
final
TopDownAnalysisParameters
topDownAnalysisParameters
;
private
final
ObservableBindingTrace
observableBindingTrace
;
private
final
ModuleDescriptor
moduleDescriptor
;
private
final
JetControlFlowDataTraceFactory
jetControlFlowDataTraceFactory
;
private
final
ModuleConfiguration
moduleConfiguration
;
private
DeclarationResolver
declarationResolver
;
private
AnnotationResolver
annotationResolver
;
...
...
@@ -63,7 +82,6 @@ public class InjectorForTopDownAnalyzerForJs {
@NotNull
TopDownAnalysisParameters
topDownAnalysisParameters
,
@NotNull
ObservableBindingTrace
observableBindingTrace
,
@NotNull
ModuleDescriptor
moduleDescriptor
,
JetControlFlowDataTraceFactory
jetControlFlowDataTraceFactory
,
@NotNull
ModuleConfiguration
moduleConfiguration
)
{
this
.
topDownAnalyzer
=
new
TopDownAnalyzer
();
...
...
@@ -76,7 +94,6 @@ public class InjectorForTopDownAnalyzerForJs {
this
.
topDownAnalysisParameters
=
topDownAnalysisParameters
;
this
.
observableBindingTrace
=
observableBindingTrace
;
this
.
moduleDescriptor
=
moduleDescriptor
;
this
.
jetControlFlowDataTraceFactory
=
jetControlFlowDataTraceFactory
;
this
.
moduleConfiguration
=
moduleConfiguration
;
this
.
declarationResolver
=
new
DeclarationResolver
();
this
.
annotationResolver
=
new
AnnotationResolver
();
...
...
@@ -114,7 +131,6 @@ public class InjectorForTopDownAnalyzerForJs {
this
.
bodyResolver
.
setTopDownAnalysisParameters
(
topDownAnalysisParameters
);
this
.
bodyResolver
.
setTrace
(
observableBindingTrace
);
this
.
controlFlowAnalyzer
.
setFlowDataTraceFactory
(
jetControlFlowDataTraceFactory
);
this
.
controlFlowAnalyzer
.
setTopDownAnalysisParameters
(
topDownAnalysisParameters
);
this
.
controlFlowAnalyzer
.
setTrace
(
observableBindingTrace
);
...
...
js/js.translator/src/org/jetbrains/k2js/analyze/AnalyzerFacadeForJS.java
浏览文件 @
dfbd9922
...
...
@@ -28,7 +28,6 @@ import org.jetbrains.jet.analyzer.AnalyzeExhaust;
import
org.jetbrains.jet.di.InjectorForTopDownAnalyzerForJs
;
import
org.jetbrains.jet.lang.DefaultModuleConfiguration
;
import
org.jetbrains.jet.lang.ModuleConfiguration
;
import
org.jetbrains.jet.lang.cfg.pseudocode.JetControlFlowDataTraceFactory
;
import
org.jetbrains.jet.lang.descriptors.ModuleDescriptor
;
import
org.jetbrains.jet.lang.descriptors.NamespaceDescriptor
;
import
org.jetbrains.jet.lang.psi.JetFile
;
...
...
@@ -91,8 +90,7 @@ public final class AnalyzerFacadeForJS {
TopDownAnalysisParameters
topDownAnalysisParameters
=
new
TopDownAnalysisParameters
(
completely
,
false
,
false
);
InjectorForTopDownAnalyzerForJs
injector
=
new
InjectorForTopDownAnalyzerForJs
(
project
,
topDownAnalysisParameters
,
new
ObservableBindingTrace
(
bindingTraceContext
),
owner
,
JetControlFlowDataTraceFactory
.
EMPTY
,
JsConfiguration
.
jsLibConfiguration
(
project
));
project
,
topDownAnalysisParameters
,
new
ObservableBindingTrace
(
bindingTraceContext
),
owner
,
JsConfiguration
.
jsLibConfiguration
(
project
));
try
{
injector
.
getTopDownAnalyzer
().
analyzeFiles
(
withJsLibAdded
(
files
,
config
));
BodiesResolveContext
bodiesResolveContext
=
storeContextForBodiesResolve
?
...
...
@@ -117,8 +115,7 @@ public final class AnalyzerFacadeForJS {
TopDownAnalysisParameters
topDownAnalysisParameters
=
new
TopDownAnalysisParameters
(
completely
,
false
,
false
);
InjectorForTopDownAnalyzerForJs
injector
=
new
InjectorForTopDownAnalyzerForJs
(
project
,
topDownAnalysisParameters
,
new
ObservableBindingTrace
(
traceContext
),
owner
,
JetControlFlowDataTraceFactory
.
EMPTY
,
JsConfiguration
.
jsLibConfiguration
(
project
));
project
,
topDownAnalysisParameters
,
new
ObservableBindingTrace
(
traceContext
),
owner
,
JsConfiguration
.
jsLibConfiguration
(
project
));
try
{
bodiesResolveContext
.
setTopDownAnalysisParameters
(
topDownAnalysisParameters
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录