Commit Graph

201 Commits

Author SHA1 Message Date
Pavel V. Talanov 891dd9fc1c extract compiler error reporting functionality from KotlinToJVMBytecodeCompiler 2012-04-25 14:24:04 +04:00
Andrey Breslav d0bd5cf9c6 Properly positioning compilation exceptions in the IDE 2012-04-25 12:25:00 +04:00
Andrey Breslav 47e096026d Escape XML strings in the compiler output 2012-04-24 22:41:04 +04:00
Andrey Breslav b467edfa03 Don't compile module scripts in verbose mode 2012-04-24 21:22:46 +04:00
Andrey Breslav 0ab212b240 Module file is not needed when compiling modules 2012-04-24 21:22:45 +04:00
Andrey Breslav 8a40f943de Module script loading separated from module compilation 2012-04-24 21:22:45 +04:00
Andrey Breslav 419f8c7415 Print a root tag in the XML output mode
Now, the compiler output in the "-tags" mode is enclosed into <MESSAGES>...</MESSAGES>
2012-04-24 21:22:45 +04:00
Evgeny Gerashchenko 9bec7b5e9d Merge branch 'diagnostics'
Conflicts:
	compiler/cli/src/org/jetbrains/jet/compiler/CompileSession.java
	compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/Errors.java
2012-04-20 21:58:05 +04:00
Stepan Koltsov 3b0c9244c9 di: @PreDestroy
I need in my private experiments
2012-04-20 21:33:18 +04:00
Andrey Breslav 13764c06c0 Compiler plugins moved to CompilerEnvironmentConfiguration 2012-04-20 14:58:14 +04:00
Andrey Breslav e33acbeebf Use CompileEnvironmentConfiguretion instead of its components 2012-04-20 14:33:49 +04:00
Andrey Breslav 4da91ee3d6 CompileEnvironment removed
What used to be CompileEnvironment, now is split into data (in CompileEnvironmentConfiguration) and utility methods (in CompileEnvironmentUtil).
CompilerDependencies should be removed later.
All the relevant stuff sits in the JetCoreEnvironment class
2012-04-20 11:52:02 +04:00
Stepan Koltsov b47d37094e properly report exception if analyze failed
#KT-1831 Fixed
2012-04-19 16:41:34 +04:00
Andrey Breslav d512d62c04 Remove unused method 2012-04-13 20:08:35 +04:00
Andrey Breslav e23cb0cb98 Fix comment text 2012-04-13 20:07:23 +04:00
Andrey Breslav e553a46294 Use common utility for retrieving FQNames 2012-04-13 20:07:02 +04:00
Andrey Breslav 4eb594024a Removed the exec(String...) method in KotlinCompiler
It's important to be aware of what stream the messages will be written to, so such a default implementation is harmful
2012-04-13 19:59:28 +04:00
Andrey Breslav 882412ea06 Proper handling of compiler messages
We used to have a triple (errorStream, messageRenderer, verbose) to represent the error reporting strategy.
 Now we have a single MessageCollector abstraction for this.
 As the MessageCollector abstraction was extracted, the need to CompilerMessageLocation and CompilerMessageSeverity arose, too.
2012-04-13 19:38:23 +04:00
Andrey Breslav 71bac57411 Got rid of CompileSession class: this class shouldn't have had any objects, now it is transformed into KotlinToJVMBytecodeCompiler 2012-04-13 19:38:22 +04:00
Evgeny Gerashchenko 370af95c87 Introduced DispatchingDiagnosticRenderer, which replaced DefaultDiagnosticRenderer. 2012-04-13 19:31:47 +04:00
Evgeny Gerashchenko a5d5eb53e2 Fixed rendering syntax error diagnostics in CompileSession. 2012-04-13 19:31:46 +04:00
Evgeny Gerashchenko b0e09319a9 Moved DefaultDiagnosticRenderer from cli back to frontend to avoid run-time dependencies on cli where rendering diagnostics is needed. 2012-04-13 19:31:46 +04:00
Evgeny Gerashchenko 8d599548ba Copied all diagnostic-rendering logic to DefaultDiagnosticRenderer. 2012-04-13 19:31:46 +04:00
Evgeny Gerashchenko cab1e00596 Replaced unnecessary "E" type parameter in DiagnosticWithParameters1 with wildcard. 2012-04-13 19:31:46 +04:00
Evgeny Gerashchenko 553ce9e5e0 Extracted DiagnosticWithParameters1Renderer, moved it along with DiagnosticRenderer to frontend module. 2012-04-13 19:31:45 +04:00
Evgeny Gerashchenko 7be6fe84be Made single parameter of Renderer.render() @NotNull, because argument was almost never @Nullable on call-sites. 2012-04-13 19:31:45 +04:00
Evgeny Gerashchenko 46d929efa1 Introduced factory to renderer map in DefaultDiagnosticRenderer. Added first renderer there. 2012-04-13 19:31:45 +04:00
Evgeny Gerashchenko 6a13510741 Replaced Diagnostic.getMessage() with DiagnosticRenderer.render() calls.
Made Diagnostic.getMessage() deprecated, introduced DiagnosticRender interface and default implementation for it.
2012-04-13 19:31:45 +04:00
Evgeny Gerashchenko 409d6b2da1 Renamed DiagnosticWithPsiElement to SimpleDiagnostic, DiagnosticFactory to SimpleDiagnosticFactory, so they relation is reflected in their names. 2012-04-13 19:31:45 +04:00
Andrey Breslav b5008ebd57 Separate environments for module script compilation and project compilation 2012-04-11 16:13:11 +04:00
Andrey Breslav f34e492022 JetCoreEnvironment encapsulates a project (in the IDEA sense), so the classpath and sources lie in its area of responsibility 2012-04-11 16:13:11 +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 0d8088268a extract code to method 2012-04-09 23:49:45 +04:00
Stepan Koltsov 03e78e8cc3 Revert "add runtime to classpath in JetCoreEnvironment" temporarily
This reverts commit 59c7f33c88.
2012-04-09 18:54:42 +04:00
Stepan Koltsov 59c7f33c88 add runtime to classpath in JetCoreEnvironment 2012-04-09 18:22:23 +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 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 7be3d247f9 fix tests after recent refactoring 2012-04-08 05:39:46 +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 0a610d81ad compiler argument parsing cleanup 2012-04-08 02:08:26 +04:00
Stepan Koltsov b38e171812 MapTypeMode and properly map builtins
used in JetTypeMapper in JetTypeMapper

* MapTypeMode contains no information not needed by JetTypeMapper
* MapTypeMode has separate VALUE and IMPL values that are needed to compile builtins
2012-04-07 06:32:18 +04:00
James Strachan 92df93a9db enabled multiple source directories in the KotlinCompiler (we should refactor later to remove src - wanted to minimise breaking things first though :) 2012-04-05 15:46:01 +01:00
Pavel V. Talanov 766b4dc975 Move AnalyzerExhaust from frontend.java to frontend. 2012-04-04 16:11:40 +04:00
Leonid Shalupov a8d6fb98f9 KotlinCompiler: split classpath by pathSeparator before adding to environment 2012-04-03 16:14:51 +04:00
Stepan Koltsov dd29cb0509 generate help with library 2012-04-03 00:29:07 +04:00
Alex Tkachman b5114d5f86 NPE fixed 2012-04-01 10:01:34 +03: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
Maxim Shafirov 060be0a8f8 Refactor dependencies, so jet-as-java might be used in cli. 2012-03-29 21:18:35 +04:00
Stepan Koltsov e6fda5b3d3 minor codegen refactoring
* cleanup after yesterday
* remove BindingContext stack in GenerationState
* use more power and strength of di

TODO: also initialize GenerationState by DI
2012-03-29 19:47:50 +04:00