Commit Graph

399 Commits

Author SHA1 Message Date
pTalanov 7da1e31eca Merge remote-tracking branch 'origin/master'
Conflicts:
	build-tools/core/src/org/jetbrains/jet/buildtools/core/BytecodeCompiler.java
	compiler/cli/src/org/jetbrains/jet/cli/jvm/K2JVMCompiler.java
	compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/CompileEnvironmentConfiguration.java
	compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/JetCoreEnvironment.java
	compiler/tests/org/jetbrains/jet/JetTestUtils.java
	compiler/tests/org/jetbrains/jet/codegen/CompileTextTest.java
2012-05-02 13:39:36 +04:00
Leonid Shalupov 8e961e00cc delete obsolete readme on maven plugin 2012-04-30 22:52:21 +04:00
Leonid Shalupov 54fa1f9fbc libraries/runtime: copy runtime module sources locally to help IDEA find them 2012-04-30 20:59:52 +04:00
Leonid Shalupov c5e1225f1c libraries: redundant ${project.basedir} 2012-04-30 20:59:16 +04:00
pTalanov f9d87cbf4b Move doMain method to CLICompiler. 2012-04-28 22:47:34 +04:00
pTalanov cdfa0678cf Extract reusable functionality from K2JVMCompiler, K2JVMCompilerArguments, CompilerEnvironmentConfiguration. 2012-04-28 22:47:33 +04:00
Stepan Koltsov 98bd8bc90a fix KDoc compilation
we should probably add alt-header for java.lang.Object that specifies
return type of Object.toString to String (without ?)
2012-04-28 20:34:33 +04:00
pTalanov d0d5b147f2 Refactor cli: all the jvm stuff goes under org.jetbrains.jet.cli.jvm, common stuff under org.jetbrains.jet.cli.common 2012-04-25 20:19:15 +04:00
Andrey Breslav 13764c06c0 Compiler plugins moved to CompilerEnvironmentConfiguration 2012-04-20 14:58:14 +04:00
Andrey Breslav 1b7128c6b6 KDoc fixed according to the compiler refactoring 2012-04-20 12:14:11 +04:00
James Strachan 091d81760c added links to the included function body source in the api docs 2012-04-17 11:48:54 +01:00
James Strachan bd39691072 fixed up apidoc comments and fixed bug in kdoc where macros would not be used if there was whitespace before the @ 2012-04-17 08:37:56 +01:00
James Strachan 0325e68a86 #KT-1795 Fixed - added hashMap() and sortedMap() helper functions for creating maps more easily using tuples 2012-04-16 12:00:47 +01:00
James Strachan 376dc1cbaa added a hacky work around until KT-1524 is resolved so we don't have any bad wiki links in the api docs 2012-04-16 11:00:20 +01:00
James Strachan 4de778c6d6 kdoc now has working interactive search of classes, functions, properties e.g. "map()" or "fun map" or "class Foo" etc 2012-04-16 09:42:30 +01:00
James Strachan 482887c052 first spike of a search box in kdoc for quick navigation 2012-04-15 08:06:47 +01:00
James Strachan 9df8f1c197 typo 2012-04-14 06:11:51 +01:00
James Strachan 6806954cb8 kdoc improvements: added discovery of ReadMe.md or ReadMe.html files in a package source directory, so we can auto-discover documentation like this https://github.com/JetBrains/kotlin/blob/master/libraries/stdlib/src/kotlin/ReadMe.md and fixed a regression where we could not find the KPackage of a descriptor with changes to the AST and fixed up some bad links to external classes 2012-04-14 05:43:15 +01:00
James Strachan 7a96079cfd kdoc improvements: added discovery of ReadMe.md or ReadMe.html files in a package source directory, so we can auto-discover documentation like this https://github.com/JetBrains/kotlin/blob/master/libraries/stdlib/src/kotlin/ReadMe.md and fixed a regression where we could not find the KPackage of a descriptor with changes to the AST 2012-04-14 05:26:23 +01:00
Hiram Chirino 954dcb49b4 Show the source code link when you hover over the members to simplify and declutter the normal doc navigation. 2012-04-13 14:29:34 -04:00
James Strachan 823c858634 minor typo fix 2012-04-13 19:26:52 +01:00
James Strachan 92e8cca7fb fixed up some more the frames links in the kdoc 2012-04-13 19:17:47 +01:00
James Strachan 92c1bd17a6 fixed up the frames links in the kdoc 2012-04-13 18:41:19 +01:00
James Strachan 20fcffbbb5 allow kdoc package summaries to use markdown for formatting and links (which works nicely in a pom.xml if using maven for example and avoids HTML escaping issues) 2012-04-13 18:20:20 +01:00
James Strachan d83b76b7a7 kdoc improvements: allow package summaries, package API doc URLs and documentation files to be specified so we can better describe package, reuse documentation for them or link to external packages. #KT-1463 Fixed 2012-04-13 17:43:54 +01: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
James Strachan da38230827 added jquery to the generated kdoc so we can start adding some nice effects and interactivity 2012-04-13 16:06:35 +01:00
James Strachan 2df5c9886f include a target and css style for external source links in the doc 2012-04-13 15:43:44 +01:00
James Strachan 43261a7172 allow kdoc to link to the online source code in a source code repo (such as github) 2012-04-13 15:07:37 +01:00
James Strachan 5802a6f0ba switched code to use nicer iteration over Map 2012-04-12 15:04:30 +01:00
James Strachan c3f1e38c67 avoid default arguments on groupBy() by having groupByTo() if the caller wishes to specify the Map to group into. Also tidied up the sample code in CollectionTest 2012-04-12 12:35:13 +01:00
Leonid Shalupov 3813e0a886 maven version = 0.1-SNAPSHOT 2012-04-12 13:03:15 +04:00
Leonid Shalupov d1246abbf1 maven: get rid of intermediate poms: examples, docs, tools (artifacts garbage) 2012-04-12 09:33:48 +04:00
Leonid Shalupov 1ecb2fe7db maven plugin: include source roots to compiler classpath (enabled mixed compilation) 2012-04-11 21:32:50 +04:00
James Strachan eaae5b4465 fixed bad property links 2012-04-11 16:36:18 +01:00
James Strachan 7f5631bcfc added better tests to check if kdoc stops working again and a few more diagnostics and warnings 2012-04-11 09:55:04 +01:00
Leonid Shalupov 1752b6f13e maven plugin: disable runtime hiding from compiler classpath 2012-04-10 23:44:56 +04:00
Leonid Shalupov 8baf7f50c1 don't set empty classpath 2012-04-10 23:26:45 +04:00
Leonid Shalupov 1a63f91cc5 maven plugin: exclude kotlin-runtime jar from classpath passed to compiler 2012-04-10 22:39:11 +04:00
Leonid Shalupov 863042da27 maven artifacts: runtime, stdlib -> kotlin-runtime, kotlin-stdlib 2012-04-10 22:39:11 +04:00
Stepan Koltsov ff9af9b348 maven-plugin: log actual compiler arguments
mvn --debug prints compiler arguments
2012-04-10 22:08:47 +04:00
Leonid Shalupov ec15591208 maven plugin: bundle jdk headers 2012-04-10 15:44:07 +04:00
Leonid Shalupov 9b020ebc28 fix kdoc 2012-04-10 15:43:51 +04:00
James Strachan c3b3e5c7c1 fixed up bad path 2012-04-10 09:40:09 +01: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
Leonid Shalupov d02928715b maven plugin: don't automatically include runtime 2012-04-09 22:51:06 +04:00
Leonid Shalupov 083ade9f68 compilation 2012-04-09 22:37:38 +04:00
Leonid Shalupov 6d47a3c2dc libraries/tools: compile kotlin runtime in maven build 2012-04-09 22:31:14 +04:00
James Strachan a40f9ee9b1 refactored the maven project structure so that things are in a simpler tree structure to avoid folks getting lost 2012-04-05 16:20:06 +01:00