Commit Graph

303 Commits

Author SHA1 Message Date
Stepan Koltsov c2adadaf39 fail early if found class is different from requested 2012-04-19 14:05:37 +04:00
Svetlana Isakova 1ed79d534f KT-151 Inherit visibility when overriding
#KT-151 Fixed

Visibilities.INHERITED constant added (occurs only during resolve), changed after overridden descriptors resolve
Fake descriptors are created for invisible properties as well (is necessary for better error reporting)
2012-04-18 19:02:24 +04:00
Stepan Koltsov 5e8b0d39db class containigDeclaration cannot be null 2012-04-17 16:03:31 +04:00
Stepan Koltsov 7b1ae33df3 fix broken tests
(JetJavaMirrorMaker still can be returned by PsiPackage.getClasses())
2012-04-13 18:14:03 +04:00
Stepan Koltsov 37fcffc39d remove assertion from JDR.resolveAnnotation
#KT-1771 fixed
2012-04-13 17:44:46 +04:00
Stepan Koltsov af4117c8d3 assert JetJavaMirrorMaker cannot appear in resolve.java 2012-04-13 17:44:42 +04:00
Stepan Koltsov bc00216df9 replace JavaPsiFacade with own 2012-04-12 20:45:00 +04:00
Stepan Koltsov 71f89ef130 more descriptorToDeclaration utils
* custom versions
* normalization code moved out of norializer
* hide DESCRIPTOR_TO_DECLARATION (make package local)
2012-04-12 00:24:12 +04:00
Stepan Koltsov 829f73cc5f some classes from runtime.jar are not meant to be loaded by JDR
* assert runtime implementations from JetStandard* are not loaded
  by JavaDescriptorResolver
* fix wrong @JetMethod in jet.Iterator
* fix jet.Iterator ns was created
* fix incorrect number of functions and tuples in JetStandardClasses
* added TODO about inconsisten Tuple class
2012-04-11 20:00:01 +04:00
Stepan Koltsov a889e29147 else on the next line
as requested by http://confluence.jetbrains.net/display/JET/Code+Conventions+for+Java

(sed is your friend)
2012-04-10 00:03:13 +04:00
Stepan Koltsov bcbcb48ef8 remove unused parameters 2012-04-09 18:22:22 +04:00
Pavel V. Talanov 7dd0e50bcd Merge with branch "AnalyzerJS" 2012-04-09 17:08:57 +04:00
Pavel V. Talanov a030576052 Merge from brahch analyzeJS.
Conflicts:
	compiler/backend/src/org/jetbrains/jet/codegen/GenerationState.java
	compiler/cli/src/org/jetbrains/jet/compiler/CompileSession.java
	compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/AnalyzerFacadeForJVM.java
	compiler/tests/org/jetbrains/jet/codegen/GenerationUtils.java
	compiler/tests/org/jetbrains/jet/resolve/ExpectedResolveData.java
	compiler/tests/org/jetbrains/jet/types/JetDefaultModalityModifiersTest.java
	idea/src/org/jetbrains/jet/plugin/libraries/JetSourceNavigationHelper.java
	idea/src/org/jetbrains/jet/plugin/parameterInfo/JetFunctionParameterInfoHandler.java
	idea/src/org/jetbrains/jet/plugin/project/WholeProjectAnalyzerFacade.java
	idea/src/org/jetbrains/jet/plugin/quickfix/ChangeVariableMutabilityFix.java
	idea/src/org/jetbrains/jet/plugin/quickfix/ImportInsertHelper.java
	idea/src/org/jetbrains/jet/plugin/quickfix/QuickFixUtil.java
	idea/src/org/jetbrains/jet/plugin/refactoring/JetNameSuggester.java
	idea/src/org/jetbrains/jet/plugin/refactoring/JetRefactoringUtil.java
	idea/src/org/jetbrains/jet/plugin/refactoring/introduceVariable/JetIntroduceVariableHandler.java
2012-04-09 17:06:56 +04:00
Stepan Koltsov bd501f3676 minor JavaDescriptorResolver refactoring 2012-04-09 03:26:04 +04:00
Stepan Koltsov 10dd366216 CompilerDependencies
Holds reference to runtime.jar and jdk-headers.jar. Paths to these
jars are no longer hardcoded.

Many tests now compile runtime before execution. Because of this:
* Single test invocation is significantly slower now for some tests
* This can be fixed by making tests independent from runtime (this
must be done anyway)

Some tests still depend on runtime.jar built by "ant dist", this
is to be fixed.
2012-04-09 03:04:50 +04:00
Stepan Koltsov 09ddfb714e cleanup in JavaDescriptorResolver 2012-04-08 23:23:59 +04:00
Stepan Koltsov b0325f14ef remove useless field in JavaNamespaceDescriptor 2012-04-08 23:23:59 +04:00
Stepan Koltsov 886cfbdb98 create JavaPackageScope for class statics
... and compute "kotlin" flag in ResolverScopeData
2012-04-08 22:26:15 +04:00
Stepan Koltsov ce0565b449 exclude JetJavaMirrorMaker in PsiClassFinder 2012-04-08 22:26:15 +04:00
Stepan Koltsov 41fb628004 merging ResolverScopeData subclasses and Java*Scope classes 2012-04-08 05:52:01 +04:00
Stepan Koltsov 7be3d247f9 fix tests after recent refactoring 2012-04-08 05:39:46 +04:00
Stepan Koltsov 611b04025d lost property from superclass 2012-04-08 03:18:38 +04:00
Stepan Koltsov a661134b35 parse property name utility 2012-04-08 03:18:35 +04:00
Stepan Koltsov f16895ba65 new compiler mode: stdlib
include jdk-headers, do not include runtime
2012-04-08 02:08:27 +04:00
Stepan Koltsov 3e9ef572ea hide another map from JavaTypeTransformer 2012-04-08 02:08:25 +04:00
Stepan Koltsov 4aec67a1c6 again: do not include jdk headers when compiling jdk headers 2012-04-08 02:08:25 +04:00
Stepan Koltsov 74e0bd85f5 remove useless and wrong code
unfortunately I couldn't write test that proves this code is wrong
2012-04-08 02:08:25 +04:00
Stepan Koltsov 20f98d554c JDR: better loop check
(using JetJavaMirrorMaker)

... and fix test
... and remove junk code
2012-04-07 23:40:38 +04:00
Stepan Koltsov 2bc305bddf store ResolverScopeData in Java*Scope 2012-04-07 23:16:48 +04:00
Stepan Koltsov 6a68de9a8b useless class 2012-04-07 23:16:48 +04:00
Stepan Koltsov b9d0363d57 properly cache JavaPackageScope 2012-04-07 23:16:48 +04:00
Stepan Koltsov 92ae9698e3 JavaDescriptorResolver: kill namespace cache by psi 2012-04-07 23:16:47 +04:00
Stepan Koltsov c653622033 JavaPackageScope refactoring
* store PsiClass and PsiPackage inside
* do not create if there's no PsiClass or PsiPackage
2012-04-07 23:16:47 +04:00
Stepan Koltsov 7bcb682180 useless logger field 2012-04-07 23:16:47 +04:00
Stepan Koltsov 498d444a0a do not expose map 2012-04-07 06:32:19 +04:00
Stepan Koltsov 8623361e22 more FqName instead of String 2012-04-07 06:32:19 +04:00
Stepan Koltsov 9b120184f5 make AltClassFinder parameterized
(class will be reused to find builtins)
2012-04-07 06:32:17 +04:00
Pavel V. Talanov 2150789502 AnalyzerFacadeForJS implements interface AnalyzerFacade.
Delete analyzer*WithCache methods from AnalyzerFacadeForJVM.
Introduce JsModuleDetector.
Move AnalyzerFacadeWithCache to idea module. Make it static, make it acquire facade through AnalyzerFacadeProvider.
2012-04-06 17:39:24 +04:00
Svetlana Isakova 2c0cee61fa Added 'package' visibility for Java descriptors 2012-04-04 19:02:26 +04:00
Pavel V. Talanov 1ad12b29fa Extract AnalyzerFacade interface. Extract AnalyzerFacadeWithCache decorator for AnalyzerFacade. 2012-04-04 17:20:27 +04:00
Pavel V. Talanov 766b4dc975 Move AnalyzerExhaust from frontend.java to frontend. 2012-04-04 16:11:40 +04:00
Svetlana Isakova 9b2eeb076e KT-1717 Don't make member visibility inherit when it is not declared explicitly
#KT-1717 Fixed
2012-04-03 19:26:28 +04:00
Svetlana Isakova f64920246a visibility can be set only after resolve overridden members, so method 'setVisibility' was separated 2012-04-03 16:36:00 +04:00
Svetlana Isakova e364fe4259 public methods in private classes visibility check 2012-04-02 15:37:09 +04:00
Svetlana Isakova 3c5d4f6857 'isVisible' strategy added to Visibility interface 2012-03-30 13:38:35 +04:00
Stepan Koltsov 2c4094f4d4 proper environment when compiling special things
* do not include anything when compiling builtins
* do not include kotlin-runtime and jdk-headers when compiling jdk-headers
2012-03-30 03:54:58 +04:00
Stepan Koltsov ec367a0bf0 merge copy-paste after excessive inline in e6fda5 2012-03-29 23:39:01 +04:00
Maxim Shafirov 060be0a8f8 Refactor dependencies, so jet-as-java might be used in cli. 2012-03-29 21:18:35 +04:00
Stepan Koltsov 1e330fe0a0 jvm.backend: get JetStandardLibrary from analyzer
This is a big step towards removal of JetStandardLibrary.getInstance()
2012-03-29 01:03:44 +04:00
Stepan Koltsov 6488d65259 rename method 2012-03-28 23:56:33 +04:00