diff --git a/build-tools/core/src/org/jetbrains/jet/buildtools/core/BytecodeCompiler.java b/build-tools/core/src/org/jetbrains/jet/buildtools/core/BytecodeCompiler.java index 3045f3b454e..c1395d86f5f 100644 --- a/build-tools/core/src/org/jetbrains/jet/buildtools/core/BytecodeCompiler.java +++ b/build-tools/core/src/org/jetbrains/jet/buildtools/core/BytecodeCompiler.java @@ -21,6 +21,7 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.compiler.CompileEnvironment; import org.jetbrains.jet.compiler.CompileEnvironmentException; import org.jetbrains.jet.compiler.CompilerPlugin; +import org.jetbrains.jet.compiler.messages.MessageCollector; import org.jetbrains.jet.lang.resolve.java.CompilerDependencies; import org.jetbrains.jet.lang.resolve.java.CompilerSpecialMode; @@ -49,7 +50,7 @@ public class BytecodeCompiler { * @return compile environment instance */ private CompileEnvironment env( String stdlib, String[] classpath ) { - CompileEnvironment env = new CompileEnvironment(CompilerDependencies.compilerDependenciesForProduction(CompilerSpecialMode.REGULAR)); + CompileEnvironment env = new CompileEnvironment(MessageCollector.PLAIN_TEXT_TO_SYSTEM_ERR, CompilerDependencies.compilerDependenciesForProduction(CompilerSpecialMode.REGULAR)); if (( stdlib != null ) && ( stdlib.trim().length() > 0 )) { env.setStdlib( stdlib ); diff --git a/compiler/backend/src/org/jetbrains/jet/compiler/TipsManager.java b/compiler/backend/src/org/jetbrains/jet/compiler/TipsManager.java index 6e1466ae670..8b6cb8c4a16 100644 --- a/compiler/backend/src/org/jetbrains/jet/compiler/TipsManager.java +++ b/compiler/backend/src/org/jetbrains/jet/compiler/TipsManager.java @@ -30,6 +30,8 @@ import org.jetbrains.jet.lang.psi.JetImportDirective; import org.jetbrains.jet.lang.psi.JetNamespaceHeader; import org.jetbrains.jet.lang.psi.JetSimpleNameExpression; import org.jetbrains.jet.lang.resolve.BindingContext; +import org.jetbrains.jet.lang.resolve.calls.autocasts.AutoCastServiceImpl; +import org.jetbrains.jet.lang.resolve.calls.autocasts.DataFlowInfo; import org.jetbrains.jet.lang.resolve.scopes.JetScope; import org.jetbrains.jet.lang.resolve.scopes.JetScopeUtils; import org.jetbrains.jet.lang.resolve.scopes.receivers.ExpressionReceiver; @@ -53,10 +55,31 @@ public final class TipsManager { JetExpression receiverExpression = expression.getReceiverExpression(); if (receiverExpression != null) { // Process as call expression - final JetScope resolutionScope = context.get(BindingContext.RESOLUTION_SCOPE, receiverExpression); + final JetScope resolutionScope = context.get(BindingContext.RESOLUTION_SCOPE, expression); final JetType expressionType = context.get(BindingContext.EXPRESSION_TYPE, receiverExpression); if (expressionType != null && resolutionScope != null) { + if (!(expressionType instanceof NamespaceType)) { + ExpressionReceiver receiverDescriptor = new ExpressionReceiver(receiverExpression, expressionType); + Set descriptors = new HashSet(); + + DataFlowInfo info = context.get(BindingContext.NON_DEFAULT_EXPRESSION_DATA_FLOW, expression); + if (info == null) { + info = DataFlowInfo.EMPTY; + } + + AutoCastServiceImpl autoCastService = new AutoCastServiceImpl(info, context); + List variantsForExplicitReceiver = autoCastService.getVariantsForReceiver(receiverDescriptor); + + for (ReceiverDescriptor descriptor : variantsForExplicitReceiver) { + descriptors.addAll(includeExternalCallableExtensions( + excludePrivateDescriptors(descriptor.getType().getMemberScope().getAllDescriptors()), + resolutionScope, descriptor)); + } + + return descriptors; + } + return includeExternalCallableExtensions( excludePrivateDescriptors(expressionType.getMemberScope().getAllDescriptors()), resolutionScope, new ExpressionReceiver(receiverExpression, expressionType)); @@ -161,7 +184,7 @@ public final class TipsManager { }); } - private static Collection includeExternalCallableExtensions( + private static Set includeExternalCallableExtensions( @NotNull Collection descriptors, @NotNull final JetScope externalScope, @NotNull final ReceiverDescriptor receiverDescriptor @@ -169,7 +192,7 @@ public final class TipsManager { // It's impossible to add extension function for namespace JetType receiverType = receiverDescriptor.getType(); if (receiverType instanceof NamespaceType) { - return descriptors; + return new HashSet(descriptors); } Set descriptorsSet = Sets.newHashSet(descriptors); diff --git a/compiler/cli/src/org/jetbrains/jet/cli/KotlinCompiler.java b/compiler/cli/src/org/jetbrains/jet/cli/KotlinCompiler.java index 055f817e86d..8be718f846a 100644 --- a/compiler/cli/src/org/jetbrains/jet/cli/KotlinCompiler.java +++ b/compiler/cli/src/org/jetbrains/jet/cli/KotlinCompiler.java @@ -18,19 +18,24 @@ package org.jetbrains.jet.cli; import com.google.common.base.Splitter; import com.google.common.collect.Iterables; +import com.google.common.collect.LinkedHashMultimap; +import com.google.common.collect.Multimap; import com.sampullara.cli.Args; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.compiler.CompileEnvironment; import org.jetbrains.jet.compiler.CompileEnvironmentException; import org.jetbrains.jet.compiler.CompilerPlugin; -import org.jetbrains.jet.compiler.MessageRenderer; -import org.jetbrains.jet.lang.diagnostics.Severity; +import org.jetbrains.jet.compiler.messages.CompilerMessageLocation; +import org.jetbrains.jet.compiler.messages.CompilerMessageSeverity; +import org.jetbrains.jet.compiler.messages.MessageCollector; +import org.jetbrains.jet.compiler.messages.MessageRenderer; import org.jetbrains.jet.lang.resolve.java.CompilerDependencies; import org.jetbrains.jet.lang.resolve.java.CompilerSpecialMode; import org.jetbrains.jet.utils.PathUtil; import java.io.File; import java.io.PrintStream; +import java.util.Collection; import java.util.List; import static org.jetbrains.jet.cli.KotlinCompiler.ExitCode.*; @@ -67,7 +72,7 @@ public class KotlinCompiler { */ public static void doMain(KotlinCompiler compiler, String[] args) { try { - ExitCode rc = compiler.exec(args); + ExitCode rc = compiler.exec(System.out, args); if (rc != OK) { System.err.println("exec() finished with " + rc + " return code"); System.exit(rc.getCode()); @@ -78,10 +83,6 @@ public class KotlinCompiler { } } - public ExitCode exec(String... args) { - return exec(System.out, args); - } - public ExitCode exec(PrintStream errStream, String... args) { CompilerArguments arguments = createArguments(); if (!parseArguments(errStream, arguments, args)) { @@ -93,17 +94,17 @@ public class KotlinCompiler { /** * Executes the compiler on the parsed arguments */ - public ExitCode exec(PrintStream errStream, CompilerArguments arguments) { + public ExitCode exec(final PrintStream errStream, CompilerArguments arguments) { if (arguments.help) { usage(errStream); return OK; } System.setProperty("java.awt.headless", "true"); - MessageRenderer messageRenderer = arguments.tags ? MessageRenderer.TAGS : MessageRenderer.PLAIN; + final MessageRenderer messageRenderer = arguments.tags ? MessageRenderer.TAGS : MessageRenderer.PLAIN; if (arguments.version) { - errStream.println(messageRenderer.render(Severity.INFO, "Kotlin Compiler version " + CompilerVersion.VERSION, null, -1, -1)); + errStream.println(messageRenderer.render(CompilerMessageSeverity.INFO, "Kotlin Compiler version " + CompilerVersion.VERSION, CompilerMessageLocation.NO_LOCATION)); } CompilerSpecialMode mode = parseCompilerSpecialMode(arguments); @@ -135,9 +136,10 @@ public class KotlinCompiler { } CompilerDependencies dependencies = new CompilerDependencies(mode, jdkHeadersJar,runtimeJar); - CompileEnvironment environment = new CompileEnvironment(messageRenderer, arguments.verbose, dependencies); + PrintingMessageCollector messageCollector = new PrintingMessageCollector(errStream, messageRenderer, arguments.verbose); + CompileEnvironment environment = new CompileEnvironment(messageCollector, dependencies); try { - configureEnvironment(environment, arguments, errStream); + configureEnvironment(environment, arguments); boolean noErrors; if (arguments.module != null) { @@ -160,6 +162,7 @@ public class KotlinCompiler { } finally { environment.dispose(); + messageCollector.printToErrStream(); } } @@ -225,10 +228,7 @@ public class KotlinCompiler { * Strategy method to configure the environment, allowing compiler * based tools to customise their own plugins */ - protected void configureEnvironment(CompileEnvironment environment, CompilerArguments arguments, PrintStream errStream) { - environment.setIgnoreErrors(false); - environment.setErrorStream(errStream); - + protected void configureEnvironment(CompileEnvironment environment, CompilerArguments arguments) { // install any compiler plugins List plugins = arguments.getCompilerPlugins(); if (plugins != null) { @@ -244,4 +244,46 @@ public class KotlinCompiler { environment.addToClasspath(Iterables.toArray(classpath, String.class)); } } + + private static class PrintingMessageCollector implements MessageCollector { + private final boolean verbose; + private final PrintStream errStream; + private final MessageRenderer messageRenderer; + + // File path (nullable) -> error message + private final Multimap groupedMessages = LinkedHashMultimap.create(); + + public PrintingMessageCollector(PrintStream errStream, + MessageRenderer messageRenderer, + boolean verbose) { + this.verbose = verbose; + this.errStream = errStream; + this.messageRenderer = messageRenderer; + } + + @Override + public void report(@NotNull CompilerMessageSeverity severity, + @NotNull String message, + @NotNull CompilerMessageLocation location) { + String text = messageRenderer.render(severity, message, location); + if (severity == CompilerMessageSeverity.LOGGING) { + if (!verbose) { + return; + } + errStream.println(text); + } + groupedMessages.put(location.getPath(), text); + } + + public void printToErrStream() { + if (!groupedMessages.isEmpty()) { + for (String path : groupedMessages.keySet()) { + Collection messageTexts = groupedMessages.get(path); + for (String text : messageTexts) { + errStream.println(text); + } + } + } + } + } } diff --git a/compiler/cli/src/org/jetbrains/jet/compiler/CompileEnvironment.java b/compiler/cli/src/org/jetbrains/jet/compiler/CompileEnvironment.java index 5520ca89347..ac22091f949 100644 --- a/compiler/cli/src/org/jetbrains/jet/compiler/CompileEnvironment.java +++ b/compiler/cli/src/org/jetbrains/jet/compiler/CompileEnvironment.java @@ -25,6 +25,8 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.codegen.ClassFileFactory; import org.jetbrains.jet.codegen.GeneratedClassLoader; +import org.jetbrains.jet.codegen.GenerationState; +import org.jetbrains.jet.compiler.messages.MessageCollector; import org.jetbrains.jet.lang.psi.JetFile; import org.jetbrains.jet.lang.psi.JetPsiUtil; import org.jetbrains.jet.lang.resolve.FqName; @@ -36,7 +38,6 @@ import org.jetbrains.jet.plugin.JetMainDetector; import java.io.File; import java.io.FileNotFoundException; import java.io.FileOutputStream; -import java.io.PrintStream; import java.util.List; /** @@ -48,48 +49,33 @@ public class CompileEnvironment { private final Disposable rootDisposable; private JetCoreEnvironment environment; - private final MessageRenderer messageRenderer; - private PrintStream errorStream = System.err; + private final MessageCollector messageCollector; - private boolean ignoreErrors = false; @NotNull private final CompilerDependencies compilerDependencies; - private final boolean verbose; - - public CompileEnvironment(CompilerDependencies compilerDependencies) { - this(MessageRenderer.PLAIN, false, compilerDependencies); - } /** * NOTE: It's very important to call dispose for every object of this class or there will be memory leaks. * @see Disposer */ - public CompileEnvironment(MessageRenderer messageRenderer, boolean verbose, @NotNull CompilerDependencies compilerDependencies) { + public CompileEnvironment(@NotNull MessageCollector messageCollector, @NotNull CompilerDependencies compilerDependencies) { + this.messageCollector = messageCollector; this.compilerDependencies = compilerDependencies; - this.verbose = verbose; this.rootDisposable = new Disposable() { @Override public void dispose() { } }; this.environment = new JetCoreEnvironment(rootDisposable, compilerDependencies); - this.messageRenderer = messageRenderer; } - public void setErrorStream(PrintStream errorStream) { - this.errorStream = errorStream; - } - - public void setIgnoreErrors(boolean ignoreErrors) { - this.ignoreErrors = ignoreErrors; - } public void dispose() { Disposer.dispose(rootDisposable); } public boolean compileModuleScript(String moduleScriptFile, @Nullable String jarPath, @Nullable String outputDir, boolean jarRuntime) { - List modules = CompileEnvironmentUtil.loadModuleScript(moduleScriptFile, messageRenderer, errorStream, verbose); + List modules = CompileEnvironmentUtil.loadModuleScript(moduleScriptFile, messageCollector); if (modules == null) { throw new CompileEnvironmentException("Module script " + moduleScriptFile + " compilation failed"); @@ -125,9 +111,6 @@ public class CompileEnvironment { } public ClassFileFactory compileModule(Module moduleBuilder, String directory) { - CompileSession moduleCompileSession = newCompileSession(); - moduleCompileSession.setStubs(compilerDependencies.getCompilerSpecialMode().isStubs()); - if (moduleBuilder.getSourceFiles().isEmpty()) { throw new CompileEnvironmentException("No source files where defined"); } @@ -150,45 +133,34 @@ public class CompileEnvironment { CompileEnvironmentUtil.ensureRuntime(environment, compilerDependencies); - if (!moduleCompileSession.analyze() && !ignoreErrors) { - return null; - } - return moduleCompileSession.generate(false).getFactory(); + return analyze(); } public ClassLoader compileText(String code) { - CompileSession session = newCompileSession(); environment.addSources(new LightVirtualFile("script" + LocalTimeCounter.currentTime() + ".kt", JetLanguage.INSTANCE, code)); - if (!session.analyze() && !ignoreErrors) { + ClassFileFactory factory = analyze(); + if (factory == null) { return null; } - - ClassFileFactory factory = session.generate(false).getFactory(); return new GeneratedClassLoader(factory); } public boolean compileBunchOfSources(String sourceFileOrDir, String jar, String outputDir, boolean includeRuntime) { - CompileSession session = newCompileSession(); - session.setStubs(compilerDependencies.getCompilerSpecialMode().isStubs()); - environment.addSources(sourceFileOrDir); - return compileBunchOfSources(jar, outputDir, includeRuntime, session); + return compileBunchOfSources(jar, outputDir, includeRuntime); } public boolean compileBunchOfSourceDirectories(List sources, String jar, String outputDir, boolean includeRuntime) { - CompileSession session = newCompileSession(); - session.setStubs(compilerDependencies.getCompilerSpecialMode().isStubs()); - for (String source : sources) { environment.addSources(source); } - return compileBunchOfSources(jar, outputDir, includeRuntime, session); + return compileBunchOfSources(jar, outputDir, includeRuntime); } - private boolean compileBunchOfSources(String jar, String outputDir, boolean includeRuntime, CompileSession session) { + private boolean compileBunchOfSources(String jar, String outputDir, boolean includeRuntime) { FqName mainClass = null; for (JetFile file : environment.getSourceFiles()) { if (JetMainDetector.hasMain(file.getDeclarations())) { @@ -200,11 +172,11 @@ public class CompileEnvironment { CompileEnvironmentUtil.ensureRuntime(environment, compilerDependencies); - if (!session.analyze() && !ignoreErrors) { + ClassFileFactory factory = analyze(); + if (factory == null) { return false; } - ClassFileFactory factory = session.generate(false).getFactory(); if (jar != null) { try { CompileEnvironmentUtil.writeToJar(factory, new FileOutputStream(jar), mainClass, includeRuntime); @@ -221,8 +193,15 @@ public class CompileEnvironment { return true; } - private CompileSession newCompileSession() { - return new CompileSession(environment, messageRenderer, errorStream, verbose, compilerDependencies); + private ClassFileFactory analyze() { + boolean stubs = compilerDependencies.getCompilerSpecialMode().isStubs(); + GenerationState generationState = + KotlinToJVMBytecodeCompiler + .analyzeAndGenerate(environment, compilerDependencies, messageCollector, stubs); + if (generationState == null) { + return null; + } + return generationState.getFactory(); } /** diff --git a/compiler/cli/src/org/jetbrains/jet/compiler/CompileEnvironmentUtil.java b/compiler/cli/src/org/jetbrains/jet/compiler/CompileEnvironmentUtil.java index 213a94a3c54..eaf0af30966 100644 --- a/compiler/cli/src/org/jetbrains/jet/compiler/CompileEnvironmentUtil.java +++ b/compiler/cli/src/org/jetbrains/jet/compiler/CompileEnvironmentUtil.java @@ -27,13 +27,18 @@ import jet.modules.Module; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.codegen.ClassFileFactory; import org.jetbrains.jet.codegen.GeneratedClassLoader; +import org.jetbrains.jet.codegen.GenerationState; +import org.jetbrains.jet.compiler.messages.MessageCollector; import org.jetbrains.jet.lang.resolve.FqName; import org.jetbrains.jet.lang.resolve.java.CompilerDependencies; import org.jetbrains.jet.lang.resolve.java.CompilerSpecialMode; import org.jetbrains.jet.lang.resolve.java.JvmAbi; import org.jetbrains.jet.utils.PathUtil; -import java.io.*; +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.io.OutputStream; import java.lang.reflect.Method; import java.net.MalformedURLException; import java.net.URL; @@ -147,7 +152,7 @@ public class CompileEnvironmentUtil { // return compileEnvironment; //} // - public static List loadModuleScript(String moduleFile, MessageRenderer messageRenderer, PrintStream errorStream, boolean verbose) { + public static List loadModuleScript(String moduleFile, MessageCollector messageCollector) { Disposable disposable = new Disposable() { @Override public void dispose() { @@ -159,14 +164,13 @@ public class CompileEnvironmentUtil { ensureRuntime(scriptEnvironment, dependencies); scriptEnvironment.addSources(moduleFile); - CompileSession scriptCompileSession = new CompileSession(scriptEnvironment, messageRenderer, errorStream, verbose, dependencies); - - if (!scriptCompileSession.analyze()) { + GenerationState generationState = KotlinToJVMBytecodeCompiler + .analyzeAndGenerate(scriptEnvironment, dependencies, messageCollector, false); + if (generationState == null) { return null; } - ClassFileFactory factory = scriptCompileSession.generate(true).getFactory(); - List modules = runDefineModules(dependencies, moduleFile, factory); + List modules = runDefineModules(dependencies, moduleFile, generationState.getFactory()); Disposer.dispose(disposable); return modules; diff --git a/compiler/cli/src/org/jetbrains/jet/compiler/CompileSession.java b/compiler/cli/src/org/jetbrains/jet/compiler/CompileSession.java deleted file mode 100644 index 8b6c4a8d1f9..00000000000 --- a/compiler/cli/src/org/jetbrains/jet/compiler/CompileSession.java +++ /dev/null @@ -1,181 +0,0 @@ -/* - * Copyright 2010-2012 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.jetbrains.jet.compiler; - -import com.google.common.base.Predicate; -import com.google.common.base.Predicates; -import com.intellij.openapi.project.Project; -import com.intellij.openapi.util.text.StringUtil; -import com.intellij.openapi.vfs.VirtualFile; -import com.intellij.psi.PsiErrorElement; -import com.intellij.psi.PsiFile; -import com.intellij.psi.PsiRecursiveElementWalkingVisitor; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.analyzer.AnalyzeExhaust; -import org.jetbrains.jet.codegen.ClassBuilderFactories; -import org.jetbrains.jet.codegen.CompilationErrorHandler; -import org.jetbrains.jet.codegen.GenerationState; -import org.jetbrains.jet.codegen.JetTypeMapper; -import org.jetbrains.jet.lang.cfg.pseudocode.JetControlFlowDataTraceFactory; -import org.jetbrains.jet.lang.descriptors.ClassDescriptor; -import org.jetbrains.jet.lang.descriptors.ClassOrNamespaceDescriptor; -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; -import org.jetbrains.jet.lang.descriptors.ModuleDescriptor; -import org.jetbrains.jet.lang.diagnostics.Diagnostic; -import org.jetbrains.jet.lang.diagnostics.DiagnosticFactory; -import org.jetbrains.jet.lang.diagnostics.DiagnosticUtils; -import org.jetbrains.jet.lang.diagnostics.Severity; -import org.jetbrains.jet.lang.psi.JetFile; -import org.jetbrains.jet.lang.resolve.BindingContext; -import org.jetbrains.jet.lang.resolve.java.AnalyzerFacadeForJVM; -import org.jetbrains.jet.lang.resolve.java.CompilerDependencies; -import org.jetbrains.jet.lang.resolve.java.JavaDescriptorResolver; -import org.jetbrains.jet.utils.Progress; - -import java.io.PrintStream; -import java.util.Collection; -import java.util.List; - -/** - * The session which handles analyzing and compiling a single module. - * - * @author yole - */ -public class CompileSession { - private final JetCoreEnvironment environment; - private final MessageCollector messageCollector; - private boolean stubs = false; - private final MessageRenderer messageRenderer; - private final PrintStream errorStream; - private final boolean verbose; - private final CompilerDependencies compilerDependencies; - private AnalyzeExhaust bindingContext; - - public CompileSession(JetCoreEnvironment environment, MessageRenderer messageRenderer, PrintStream errorStream, boolean verbose, - @NotNull CompilerDependencies compilerDependencies) { - this.environment = environment; - this.messageRenderer = messageRenderer; - this.errorStream = errorStream; - this.verbose = verbose; - this.compilerDependencies = compilerDependencies; - this.messageCollector = new MessageCollector(this.messageRenderer); - } - - @NotNull - public AnalyzeExhaust getBindingContext() { - return bindingContext; - } - - public void setStubs(boolean stubs) { - this.stubs = stubs; - } - - public boolean analyze() { - reportSyntaxErrors(); - analyzeAndReportSemanticErrors(); - - messageCollector.printTo(errorStream); - - return !messageCollector.hasErrors(); - } - - /** - * @see JetTypeMapper#getFQName(DeclarationDescriptor) - * TODO possibly duplicates DescriptorUtils#getFQName(DeclarationDescriptor) - */ - private static String fqName(ClassOrNamespaceDescriptor descriptor) { - DeclarationDescriptor containingDeclaration = descriptor.getContainingDeclaration(); - if (containingDeclaration == null || containingDeclaration instanceof ModuleDescriptor || containingDeclaration.getName().equals(JavaDescriptorResolver.JAVA_ROOT)) { - return descriptor.getName(); - } - else { - return fqName((ClassOrNamespaceDescriptor) containingDeclaration) + "." + descriptor.getName(); - } - } - - private void analyzeAndReportSemanticErrors() { - Predicate filesToAnalyzeCompletely = - stubs ? Predicates.alwaysFalse() : Predicates.alwaysTrue(); - bindingContext = AnalyzerFacadeForJVM.analyzeFilesWithJavaIntegration( - environment.getProject(), environment.getSourceFiles(), filesToAnalyzeCompletely, JetControlFlowDataTraceFactory.EMPTY, - compilerDependencies); - - for (Diagnostic diagnostic : bindingContext.getBindingContext().getDiagnostics()) { - reportDiagnostic(messageCollector, diagnostic); - } - - reportIncompleteHierarchies(messageCollector); - } - - private void reportIncompleteHierarchies(MessageCollector collector) { - Collection incompletes = bindingContext.getBindingContext().getKeys(BindingContext.INCOMPLETE_HIERARCHY); - if (!incompletes.isEmpty()) { - StringBuilder message = new StringBuilder("The following classes have incomplete hierarchies:\n"); - for (ClassDescriptor incomplete : incompletes) { - message.append(" ").append(fqName(incomplete)).append("\n"); - } - collector.report(Severity.ERROR, message.toString(), null, -1, -1); - } - } - - private void reportSyntaxErrors() { - for (JetFile file : environment.getSourceFiles()) { - file.accept(new PsiRecursiveElementWalkingVisitor() { - @Override - public void visitErrorElement(PsiErrorElement element) { - String description = element.getErrorDescription(); - String message = StringUtil.isEmpty(description) ? "Syntax error" : description; - Diagnostic diagnostic = DiagnosticFactory.create(Severity.ERROR, message).on(element); - reportDiagnostic(messageCollector, diagnostic); - } - }); - } - } - - private static void reportDiagnostic(MessageCollector collector, Diagnostic diagnostic) { - DiagnosticUtils.LineAndColumn lineAndColumn = DiagnosticUtils.getLineAndColumn(diagnostic); - VirtualFile virtualFile = diagnostic.getPsiFile().getVirtualFile(); - String path = virtualFile == null ? null : virtualFile.getPath(); - collector.report(diagnostic.getSeverity(), diagnostic.getMessage(), path, lineAndColumn.getLine(), lineAndColumn.getColumn()); - } - - @NotNull - public GenerationState generate(boolean module) { - Project project = environment.getProject(); - GenerationState generationState = new GenerationState(project, ClassBuilderFactories.binaries(stubs), - verbose ? new BackendProgress() : Progress.DEAF, bindingContext, environment.getSourceFiles(), compilerDependencies.getCompilerSpecialMode()); - generationState.compileCorrectFiles(CompilationErrorHandler.THROW_EXCEPTION); - - List plugins = environment.getCompilerPlugins(); - if (!module) { - if (plugins != null) { - CompilerPluginContext context = new CompilerPluginContext(project, bindingContext.getBindingContext(), environment.getSourceFiles()); - for (CompilerPlugin plugin : plugins) { - plugin.processFiles(context); - } - } - } - return generationState; - } - - private class BackendProgress implements Progress { - @Override - public void log(String message) { - errorStream.println(messageRenderer.render(Severity.LOGGING, message, null, -1, -1)); - } - } -} diff --git a/compiler/cli/src/org/jetbrains/jet/compiler/KotlinToJVMBytecodeCompiler.java b/compiler/cli/src/org/jetbrains/jet/compiler/KotlinToJVMBytecodeCompiler.java new file mode 100644 index 00000000000..51557493b91 --- /dev/null +++ b/compiler/cli/src/org/jetbrains/jet/compiler/KotlinToJVMBytecodeCompiler.java @@ -0,0 +1,187 @@ +/* + * Copyright 2010-2012 JetBrains s.r.o. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.jetbrains.jet.compiler; + +import com.google.common.base.Predicate; +import com.google.common.base.Predicates; +import com.intellij.openapi.project.Project; +import com.intellij.openapi.util.Ref; +import com.intellij.openapi.util.text.StringUtil; +import com.intellij.openapi.vfs.VirtualFile; +import com.intellij.psi.PsiErrorElement; +import com.intellij.psi.PsiFile; +import com.intellij.psi.PsiRecursiveElementWalkingVisitor; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; +import org.jetbrains.jet.analyzer.AnalyzeExhaust; +import org.jetbrains.jet.codegen.ClassBuilderFactories; +import org.jetbrains.jet.codegen.CompilationErrorHandler; +import org.jetbrains.jet.codegen.GenerationState; +import org.jetbrains.jet.compiler.messages.CompilerMessageLocation; +import org.jetbrains.jet.compiler.messages.CompilerMessageSeverity; +import org.jetbrains.jet.compiler.messages.MessageCollector; +import org.jetbrains.jet.lang.cfg.pseudocode.JetControlFlowDataTraceFactory; +import org.jetbrains.jet.lang.descriptors.ClassDescriptor; +import org.jetbrains.jet.lang.diagnostics.Diagnostic; +import org.jetbrains.jet.lang.diagnostics.DiagnosticFactory; +import org.jetbrains.jet.lang.diagnostics.DiagnosticUtils; +import org.jetbrains.jet.lang.diagnostics.Severity; +import org.jetbrains.jet.lang.psi.JetFile; +import org.jetbrains.jet.lang.resolve.BindingContext; +import org.jetbrains.jet.lang.resolve.DescriptorUtils; +import org.jetbrains.jet.lang.resolve.java.AnalyzerFacadeForJVM; +import org.jetbrains.jet.lang.resolve.java.CompilerDependencies; +import org.jetbrains.jet.utils.Progress; + +import java.util.Collection; +import java.util.List; + +/** + * @author yole + * @author abreslav + */ +public class KotlinToJVMBytecodeCompiler { + + @Nullable + public static GenerationState analyzeAndGenerate( + JetCoreEnvironment environment, + CompilerDependencies dependencies, + + final MessageCollector messageCollector, + + boolean stubs + ) { + AnalyzeExhaust exhaust = analyze(environment, dependencies, messageCollector, stubs); + + if (exhaust == null) { + return null; + } + + return generate(environment, dependencies, messageCollector, exhaust, stubs); + } + + @Nullable + private static AnalyzeExhaust analyze( + JetCoreEnvironment environment, + CompilerDependencies dependencies, + final MessageCollector messageCollector, + boolean stubs) { + final Ref hasErrors = new Ref(false); + final MessageCollector messageCollectorWrapper = new MessageCollector() { + + @Override + public void report(@NotNull CompilerMessageSeverity severity, + @NotNull String message, + @NotNull CompilerMessageLocation location) { + if (CompilerMessageSeverity.ERRORS.contains(severity)) { + hasErrors.set(true); + } + messageCollector.report(severity, message, location); + } + }; + + // Report syntax errors + for (JetFile file : environment.getSourceFiles()) { + file.accept(new PsiRecursiveElementWalkingVisitor() { + @Override + public void visitErrorElement(PsiErrorElement element) { + String description = element.getErrorDescription(); + String message = StringUtil.isEmpty(description) ? "Syntax error" : description; + Diagnostic diagnostic = DiagnosticFactory.create(Severity.ERROR, message).on(element); + reportDiagnostic(messageCollectorWrapper, diagnostic); + } + }); + } + + // Analyze and report semantic errors + Predicate filesToAnalyzeCompletely = + stubs ? Predicates.alwaysFalse() : Predicates.alwaysTrue(); + AnalyzeExhaust exhaust = AnalyzerFacadeForJVM.analyzeFilesWithJavaIntegration( + environment.getProject(), environment.getSourceFiles(), filesToAnalyzeCompletely, JetControlFlowDataTraceFactory.EMPTY, + dependencies); + + for (Diagnostic diagnostic : exhaust.getBindingContext().getDiagnostics()) { + reportDiagnostic(messageCollectorWrapper, diagnostic); + } + + reportIncompleteHierarchies(messageCollectorWrapper, exhaust); + + return hasErrors.get() ? null : exhaust; + } + + @NotNull + private static GenerationState generate( + JetCoreEnvironment environment, + CompilerDependencies dependencies, + + final MessageCollector messageCollector, + + AnalyzeExhaust exhaust, + + boolean stubs) { + Project project = environment.getProject(); + Progress backendProgress = new Progress() { + @Override + public void log(String message) { + messageCollector.report(CompilerMessageSeverity.LOGGING, message, CompilerMessageLocation.NO_LOCATION); + } + }; + GenerationState generationState = new GenerationState(project, ClassBuilderFactories.binaries(stubs), backendProgress, + exhaust, environment.getSourceFiles(), dependencies.getCompilerSpecialMode()); + generationState.compileCorrectFiles(CompilationErrorHandler.THROW_EXCEPTION); + + List plugins = environment.getCompilerPlugins(); + if (plugins != null) { + CompilerPluginContext context = new CompilerPluginContext(project, exhaust.getBindingContext(), environment.getSourceFiles()); + for (CompilerPlugin plugin : plugins) { + plugin.processFiles(context); + } + } + return generationState; + } + + private static void reportDiagnostic(MessageCollector collector, Diagnostic diagnostic) { + DiagnosticUtils.LineAndColumn lineAndColumn = DiagnosticUtils.getLineAndColumn(diagnostic); + VirtualFile virtualFile = diagnostic.getPsiFile().getVirtualFile(); + String path = virtualFile == null ? null : virtualFile.getPath(); + collector.report(convertSeverity(diagnostic.getSeverity()), diagnostic.getMessage(), CompilerMessageLocation.create(path, lineAndColumn.getLine(), lineAndColumn.getColumn())); + } + + private static CompilerMessageSeverity convertSeverity(Severity severity) { + switch (severity) { + case INFO: + return CompilerMessageSeverity.INFO; + case ERROR: + return CompilerMessageSeverity.ERROR; + case WARNING: + return CompilerMessageSeverity.WARNING; + } + throw new IllegalStateException("Unknown severity: " + severity); + } + + private static void reportIncompleteHierarchies(MessageCollector collector, AnalyzeExhaust exhaust) { + Collection incompletes = exhaust.getBindingContext().getKeys(BindingContext.INCOMPLETE_HIERARCHY); + if (!incompletes.isEmpty()) { + StringBuilder message = new StringBuilder("The following classes have incomplete hierarchies:\n"); + for (ClassDescriptor incomplete : incompletes) { + String fqName = DescriptorUtils.getFQName(incomplete).getFqName(); + message.append(" ").append(fqName).append("\n"); + } + collector.report(CompilerMessageSeverity.ERROR, message.toString(), CompilerMessageLocation.NO_LOCATION); + } + } +} diff --git a/compiler/cli/src/org/jetbrains/jet/compiler/MessageCollector.java b/compiler/cli/src/org/jetbrains/jet/compiler/MessageCollector.java deleted file mode 100644 index 397716a7c59..00000000000 --- a/compiler/cli/src/org/jetbrains/jet/compiler/MessageCollector.java +++ /dev/null @@ -1,61 +0,0 @@ -/* - * Copyright 2010-2012 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.jetbrains.jet.compiler; - -import com.google.common.collect.LinkedHashMultimap; -import com.google.common.collect.Multimap; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.diagnostics.Severity; - -import java.io.PrintStream; -import java.util.Collection; - -/** -* @author alex.tkachman -*/ -/*package*/ class MessageCollector { - // File path (nullable) -> error message - private final Multimap groupedMessages = LinkedHashMultimap.create(); - - private final MessageRenderer renderer; - private boolean hasErrors; - - public MessageCollector(@NotNull MessageRenderer renderer) { - this.renderer = renderer; - } - - public void report(@NotNull Severity severity, @NotNull String message, @Nullable String path, int line, int column) { - hasErrors |= severity == Severity.ERROR; - groupedMessages.put(path, renderer.render(severity, message, path, line, column)); - } - - public void printTo(@NotNull PrintStream out) { - if (!groupedMessages.isEmpty()) { - for (String path : groupedMessages.keySet()) { - Collection diagnostics = groupedMessages.get(path); - for (String diagnostic : diagnostics) { - out.println(diagnostic); - } - } - } - } - - public boolean hasErrors() { - return hasErrors; - } -} diff --git a/compiler/cli/src/org/jetbrains/jet/compiler/messages/CompilerMessageLocation.java b/compiler/cli/src/org/jetbrains/jet/compiler/messages/CompilerMessageLocation.java new file mode 100644 index 00000000000..f39e6c43a4e --- /dev/null +++ b/compiler/cli/src/org/jetbrains/jet/compiler/messages/CompilerMessageLocation.java @@ -0,0 +1,57 @@ +/* + * Copyright 2010-2012 JetBrains s.r.o. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.jetbrains.jet.compiler.messages; + +import org.jetbrains.annotations.Nullable; + +/** + * @author abreslav + */ +public class CompilerMessageLocation { + + public static final CompilerMessageLocation NO_LOCATION = new CompilerMessageLocation(null, -1, -1); + + public static CompilerMessageLocation create(@Nullable String path, int line, int column) { + if (path == null) { + return NO_LOCATION; + } + return new CompilerMessageLocation(path, line, column); + } + + private final String path; + private final int line; + private final int column; + + private CompilerMessageLocation(@Nullable String path, int line, int column) { + this.path = path; + this.line = line; + this.column = column; + } + + @Nullable + public String getPath() { + return path; + } + + public int getLine() { + return line; + } + + public int getColumn() { + return column; + } +} diff --git a/compiler/cli/src/org/jetbrains/jet/compiler/messages/CompilerMessageSeverity.java b/compiler/cli/src/org/jetbrains/jet/compiler/messages/CompilerMessageSeverity.java new file mode 100644 index 00000000000..9171be05403 --- /dev/null +++ b/compiler/cli/src/org/jetbrains/jet/compiler/messages/CompilerMessageSeverity.java @@ -0,0 +1,32 @@ +/* + * Copyright 2010-2012 JetBrains s.r.o. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.jetbrains.jet.compiler.messages; + +import java.util.EnumSet; + +/** + * @author abreslav + */ +public enum CompilerMessageSeverity { + INFO, + ERROR, + WARNING, + EXCEPTION, + LOGGING; + + public static final EnumSet ERRORS = EnumSet.of(ERROR, EXCEPTION); +} diff --git a/compiler/cli/src/org/jetbrains/jet/compiler/messages/MessageCollector.java b/compiler/cli/src/org/jetbrains/jet/compiler/messages/MessageCollector.java new file mode 100644 index 00000000000..5fb1b0973a0 --- /dev/null +++ b/compiler/cli/src/org/jetbrains/jet/compiler/messages/MessageCollector.java @@ -0,0 +1,31 @@ +/* + * Copyright 2010-2012 JetBrains s.r.o. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.jetbrains.jet.compiler.messages; + +import org.jetbrains.annotations.NotNull; + +public interface MessageCollector { + MessageCollector PLAIN_TEXT_TO_SYSTEM_ERR = new MessageCollector() { + @Override + public void report(@NotNull CompilerMessageSeverity severity, @NotNull String message, @NotNull CompilerMessageLocation location) { + System.err.println(MessageRenderer.PLAIN.render(severity, message, location)); + } + }; + + void report(@NotNull CompilerMessageSeverity severity, @NotNull String message, @NotNull CompilerMessageLocation location); +} + diff --git a/compiler/cli/src/org/jetbrains/jet/compiler/MessageRenderer.java b/compiler/cli/src/org/jetbrains/jet/compiler/messages/MessageRenderer.java similarity index 56% rename from compiler/cli/src/org/jetbrains/jet/compiler/MessageRenderer.java rename to compiler/cli/src/org/jetbrains/jet/compiler/messages/MessageRenderer.java index 9f91e649d1b..acf7ec08e21 100644 --- a/compiler/cli/src/org/jetbrains/jet/compiler/MessageRenderer.java +++ b/compiler/cli/src/org/jetbrains/jet/compiler/messages/MessageRenderer.java @@ -14,11 +14,9 @@ * limitations under the License. */ -package org.jetbrains.jet.compiler; +package org.jetbrains.jet.compiler.messages; import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.diagnostics.Severity; import java.io.PrintWriter; import java.io.StringWriter; @@ -29,48 +27,46 @@ import java.io.StringWriter; public interface MessageRenderer { MessageRenderer TAGS = new MessageRenderer() { - private String renderWithStringSeverity(String severityString, String message, String path, int line, int column) { + @Override + public String render(@NotNull CompilerMessageSeverity severity, @NotNull String message, @NotNull CompilerMessageLocation location) { StringBuilder out = new StringBuilder(); - out.append("<").append(severityString); - if (path != null) { - out.append(" path=\"").append(path).append("\""); - out.append(" line=\"").append(line).append("\""); - out.append(" column=\"").append(column).append("\""); + out.append("<").append(severity.toString()); + if (location.getPath() != null) { + out.append(" path=\"").append(location.getPath()).append("\""); + out.append(" line=\"").append(location.getLine()).append("\""); + out.append(" column=\"").append(location.getColumn()).append("\""); } out.append(">\n"); out.append(message); - out.append("\n"); + out.append("\n"); return out.toString(); } - @Override - public String render(@NotNull Severity severity, @NotNull String message, @Nullable String path, int line, int column) { - return renderWithStringSeverity(severity.toString(), message, path, line, column); - } - @Override public String renderException(@NotNull Throwable e) { - return renderWithStringSeverity("EXCEPTION", PLAIN.renderException(e), null, -1, -1); + return render(CompilerMessageSeverity.EXCEPTION, PLAIN.renderException(e), CompilerMessageLocation.NO_LOCATION); } }; MessageRenderer PLAIN = new MessageRenderer() { @Override - public String render(@NotNull Severity severity, @NotNull String message, @Nullable String path, int line, int column) { - String position = path == null ? "" : path + ": (" + (line + ", " + column) + ") "; + public String render(@NotNull CompilerMessageSeverity severity, @NotNull String message, @NotNull CompilerMessageLocation location) { + String path = location.getPath(); + String position = path == null ? "" : path + ": (" + (location.getLine() + ", " + location.getColumn()) + ") "; return severity + ": " + position + message; } @Override public String renderException(@NotNull Throwable e) { StringWriter out = new StringWriter(); + //noinspection IOResourceOpenedButNotSafelyClosed e.printStackTrace(new PrintWriter(out)); return out.toString(); } }; - String render(@NotNull Severity severity, @NotNull String message, @Nullable String path, int line, int column); + String render(@NotNull CompilerMessageSeverity severity, @NotNull String message, @NotNull CompilerMessageLocation location); String renderException(@NotNull Throwable e); } diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java index 88e41002402..4697ec71d1a 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java @@ -1616,8 +1616,10 @@ public class JavaDescriptorResolver { PsiAnnotationParameterList parameterList = psiAnnotation.getParameterList(); for (PsiNameValuePair psiNameValuePair : parameterList.getAttributes()) { PsiAnnotationMemberValue value = psiNameValuePair.getValue(); - // todo - assert value instanceof PsiLiteralExpression; + if (!(value instanceof PsiLiteralExpression)) { + // todo + continue; + } Object literalValue = ((PsiLiteralExpression) value).getValue(); if(literalValue instanceof String) valueArguments.add(new StringValue((String) literalValue)); diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaPsiFacadeKotlinHacks.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaPsiFacadeKotlinHacks.java new file mode 100644 index 00000000000..29faad69f95 --- /dev/null +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaPsiFacadeKotlinHacks.java @@ -0,0 +1,105 @@ +/* + * Copyright 2010-2012 JetBrains s.r.o. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.jetbrains.jet.lang.resolve.java; + +import com.google.common.collect.Lists; +import com.intellij.core.CoreJavaFileManager; +import com.intellij.openapi.progress.ProgressIndicatorProvider; +import com.intellij.openapi.project.Project; +import com.intellij.psi.PsiClass; +import com.intellij.psi.PsiElementFinder; +import com.intellij.psi.PsiPackage; +import com.intellij.psi.impl.JavaPsiFacadeImpl; +import com.intellij.psi.impl.file.impl.JavaFileManager; +import com.intellij.psi.search.GlobalSearchScope; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + +import java.util.List; + +/** + * TODO Temporary class until {@link JavaPsiFacadeImpl} hacked. + * + * @author Stepan Koltsov + * + * @see JavaPsiFacadeImpl + */ +public class JavaPsiFacadeKotlinHacks { + public interface KotlinFinderMarker {} + + private final JavaFileManager javaFileManager; + private final List extensionPsiElementFinders; + + public JavaPsiFacadeKotlinHacks(@NotNull Project project) { + this.javaFileManager = findJavaFileManager(project); + this.extensionPsiElementFinders = Lists.newArrayList(); + for (PsiElementFinder finder : project.getExtensions(PsiElementFinder.EP_NAME)) { + if (!(finder instanceof KotlinFinderMarker)) { + this.extensionPsiElementFinders.add(finder); + } + } + } + + @NotNull + private JavaFileManager findJavaFileManager(@NotNull Project project) { + JavaFileManager javaFileManager = project.getComponent(JavaFileManager.class); + if (javaFileManager != null) { + return javaFileManager; + } + javaFileManager = project.getComponent(CoreJavaFileManager.class); + if (javaFileManager != null) { + // TODO: why it is not found by JavaFileManager? + return javaFileManager; + } + throw new IllegalStateException("JavaFileManager component is not found in project"); + } + + @Nullable + public PsiPackage findPackage(@NotNull String qualifiedName) { + PsiPackage psiPackage = javaFileManager.findPackage(qualifiedName); + if (psiPackage != null) { + return psiPackage; + } + + for (PsiElementFinder finder : extensionPsiElementFinders) { + psiPackage = finder.findPackage(qualifiedName); + if (psiPackage != null) { + return psiPackage; + } + } + return psiPackage; + } + + public PsiClass findClass(@NotNull final String qualifiedName, @NotNull GlobalSearchScope scope) { + ProgressIndicatorProvider.checkCanceled(); // We hope this method is being called often enough to cancel daemon processes smoothly + + PsiClass aClass = javaFileManager.findClass(qualifiedName, scope); + if (aClass != null) { + return aClass; + } + + for (PsiElementFinder finder : extensionPsiElementFinders) { + aClass = finder.findClass(qualifiedName, scope); + if (aClass != null) { + return aClass; + } + } + + return null; + } + +} diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/PsiClassFinderForJvm.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/PsiClassFinderForJvm.java index 48da447d8a8..07040b7be22 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/PsiClassFinderForJvm.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/PsiClassFinderForJvm.java @@ -18,7 +18,6 @@ package org.jetbrains.jet.lang.resolve.java; import com.intellij.openapi.project.Project; import com.intellij.openapi.vfs.VirtualFile; -import com.intellij.psi.JavaPsiFacade; import com.intellij.psi.PsiAnnotation; import com.intellij.psi.PsiClass; import com.intellij.psi.PsiPackage; @@ -46,7 +45,7 @@ public class PsiClassFinderForJvm implements PsiClassFinder { private AltClassFinder altClassFinder; private GlobalSearchScope javaSearchScope; - private JavaPsiFacade javaFacade; + private JavaPsiFacadeKotlinHacks javaFacade; @Inject public void setProject(@NotNull Project project) { @@ -67,7 +66,7 @@ public class PsiClassFinderForJvm implements PsiClassFinder { return myBaseScope.contains(file) && file.getFileType() != JetFileType.INSTANCE; } }; - this.javaFacade = JavaPsiFacade.getInstance(project); + this.javaFacade = new JavaPsiFacadeKotlinHacks(project); } @@ -93,7 +92,7 @@ public class PsiClassFinderForJvm implements PsiClassFinder { } if (result instanceof JetJavaMirrorMarker) { - return null; + throw new IllegalStateException("JetJavaMirrorMaker is not possible in resolve.java, resolving: " + qualifiedName); } if (result == null) { diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/Severity.java b/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/Severity.java index 47386211b6e..654da08f2f7 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/Severity.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/Severity.java @@ -20,7 +20,6 @@ package org.jetbrains.jet.lang.diagnostics; * @author abreslav */ public enum Severity { - LOGGING, INFO, ERROR, WARNING diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BindingContext.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BindingContext.java index e733a887eda..5ebff0f781e 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BindingContext.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BindingContext.java @@ -24,6 +24,7 @@ import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor; import org.jetbrains.jet.lang.diagnostics.Diagnostic; import org.jetbrains.jet.lang.psi.*; import org.jetbrains.jet.lang.resolve.calls.ResolvedCall; +import org.jetbrains.jet.lang.resolve.calls.autocasts.DataFlowInfo; import org.jetbrains.jet.lang.resolve.constants.CompileTimeConstant; import org.jetbrains.jet.lang.resolve.scopes.JetScope; import org.jetbrains.jet.lang.types.DeferredType; @@ -32,7 +33,6 @@ import org.jetbrains.jet.util.Box; import org.jetbrains.jet.util.slicedmap.*; import java.util.Collection; -import java.util.Set; import static org.jetbrains.jet.util.slicedmap.RewritePolicy.DO_NOTHING; @@ -63,6 +63,9 @@ public interface BindingContext { /** A scope where type of expression has been resolved */ WritableSlice RESOLUTION_SCOPE = Slices.createSimpleSlice(); + /** Collected during analyze, used in IDE in auto-cast completion */ + WritableSlice NON_DEFAULT_EXPRESSION_DATA_FLOW = Slices.createSimpleSlice(); + WritableSlice VARIABLE_REASSIGNMENT = Slices.createSimpleSetSlice(); WritableSlice AUTO_CREATED_IT = Slices.createSimpleSetSlice(); WritableSlice VARIABLE_ASSIGNMENT = Slices.createSimpleSlice(); diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BodyResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BodyResolver.java index e77c9c43acb..adb1d676230 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BodyResolver.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BodyResolver.java @@ -358,7 +358,9 @@ public class BodyResolver { public void visitDelegationToSuperCallSpecifier(JetDelegatorToSuperCall call) { JetTypeReference typeReference = call.getTypeReference(); if (typeReference != null) { - callResolver.resolveFunctionCall(trace, scopeForSupertypeInitializers, CallMaker.makeCall(ReceiverDescriptor.NO_RECEIVER, null, call), NO_EXPECTED_TYPE, dataFlowInfo); + callResolver.resolveFunctionCall(trace, scopeForSupertypeInitializers, + CallMaker.makeCall(ReceiverDescriptor.NO_RECEIVER, null, call), + NO_EXPECTED_TYPE, dataFlowInfo); } } diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CallResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CallResolver.java index f5cc258199c..bb344def4ee 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CallResolver.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CallResolver.java @@ -28,7 +28,10 @@ import org.jetbrains.jet.lang.psi.*; import org.jetbrains.jet.lang.resolve.*; import org.jetbrains.jet.lang.resolve.calls.autocasts.AutoCastServiceImpl; import org.jetbrains.jet.lang.resolve.calls.autocasts.DataFlowInfo; -import org.jetbrains.jet.lang.resolve.calls.inference.*; +import org.jetbrains.jet.lang.resolve.calls.inference.ConstraintSystem; +import org.jetbrains.jet.lang.resolve.calls.inference.ConstraintSystemSolution; +import org.jetbrains.jet.lang.resolve.calls.inference.ConstraintSystemWithPriorities; +import org.jetbrains.jet.lang.resolve.calls.inference.DebugConstraintResolutionListener; import org.jetbrains.jet.lang.resolve.scopes.JetScope; import org.jetbrains.jet.lang.resolve.scopes.receivers.ExpressionReceiver; import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverDescriptor; @@ -42,8 +45,7 @@ import javax.inject.Inject; import java.util.*; import static org.jetbrains.jet.lang.diagnostics.Errors.*; -import static org.jetbrains.jet.lang.resolve.BindingContext.AUTOCAST; -import static org.jetbrains.jet.lang.resolve.BindingContext.RESOLUTION_SCOPE; +import static org.jetbrains.jet.lang.resolve.BindingContext.*; import static org.jetbrains.jet.lang.resolve.calls.ResolutionStatus.*; import static org.jetbrains.jet.lang.resolve.calls.ResolvedCallImpl.MAP_TO_CANDIDATE; import static org.jetbrains.jet.lang.resolve.calls.ResolvedCallImpl.MAP_TO_RESULT; @@ -255,6 +257,10 @@ public class CallResolver { context.trace.record(ResolutionDebugInfo.RESOLUTION_DEBUG_INFO, context.call.getCallElement(), debugInfo); context.trace.record(RESOLUTION_SCOPE, context.call.getCalleeExpression(), context.scope); + if (context.dataFlowInfo.hasTypeInfoConstraints()) { + context.trace.record(NON_DEFAULT_EXPRESSION_DATA_FLOW, context.call.getCalleeExpression(), context.dataFlowInfo); + } + debugInfo.set(ResolutionDebugInfo.TASKS, prioritizedTasks); TemporaryBindingTrace traceForFirstNonemptyCandidateSet = null; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/autocasts/AutoCastUtils.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/autocasts/AutoCastUtils.java index 688b1c8ad88..44d4277b840 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/autocasts/AutoCastUtils.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/autocasts/AutoCastUtils.java @@ -36,7 +36,10 @@ public class AutoCastUtils { /** * @return variants @param receiverToCast may be cast to according to @param dataFlowInfo, @param receiverToCast itself is NOT included */ - public static List getAutoCastVariants(@NotNull final BindingContext bindingContext, @NotNull final DataFlowInfo dataFlowInfo, @NotNull ReceiverDescriptor receiverToCast) { + public static List getAutoCastVariants( + @NotNull final BindingContext bindingContext, + @NotNull final DataFlowInfo dataFlowInfo, @NotNull ReceiverDescriptor receiverToCast + ) { return receiverToCast.accept(new ReceiverDescriptorVisitor, Object>() { @Override public List visitNoReceiver(ReceiverDescriptor noReceiver, Object data) { @@ -72,7 +75,8 @@ public class AutoCastUtils { // else if (expression instanceof JetThisExpression) { // return castThis(dataFlowInfo, receiver); // } - DataFlowValue dataFlowValue = DataFlowValueFactory.INSTANCE.createDataFlowValue(receiver.getExpression(),receiver.getType(), bindingContext); + DataFlowValue dataFlowValue = DataFlowValueFactory.INSTANCE.createDataFlowValue(receiver.getExpression(),receiver.getType(), + bindingContext); List result = Lists.newArrayList(); for (JetType possibleType : dataFlowInfo.getPossibleTypes(dataFlowValue)) { result.add(new AutoCastReceiver(receiver, possibleType, dataFlowValue.isStableIdentifier())); diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/autocasts/DataFlowInfo.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/autocasts/DataFlowInfo.java index da2db981af3..ab56ec113ed 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/autocasts/DataFlowInfo.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/autocasts/DataFlowInfo.java @@ -50,7 +50,9 @@ public class DataFlowInfo { } }; - public static DataFlowInfo EMPTY = new DataFlowInfo(ImmutableMap.of(), Multimaps.newListMultimap(Collections.>emptyMap(), CommonSuppliers.getArrayListSupplier())); + public static DataFlowInfo EMPTY = new DataFlowInfo( + ImmutableMap.of(), + Multimaps.newListMultimap(Collections.>emptyMap(), CommonSuppliers.getArrayListSupplier())); private final ImmutableMap nullabilityInfo; /** Also immutable */ @@ -195,6 +197,10 @@ public class DataFlowInfo { return new DataFlowInfo(ImmutableMap.copyOf(builder), newTypeInfo); } + public boolean hasTypeInfoConstraints() { + return !typeInfo.isEmpty(); + } + } //public class DataFlowInfo { diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/BasicExpressionTypingVisitor.java b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/BasicExpressionTypingVisitor.java index cc14ac19b04..66059c490fe 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/BasicExpressionTypingVisitor.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/BasicExpressionTypingVisitor.java @@ -617,6 +617,13 @@ public class BasicExpressionTypingVisitor extends ExpressionTypingVisitor { temporaryTrace.commit(); return null; } + + // Uncommitted changes in temp context + context.trace.record(RESOLUTION_SCOPE, nameExpression, context.scope); + if (context.dataFlowInfo.hasTypeInfoConstraints()) { + context.trace.record(NON_DEFAULT_EXPRESSION_DATA_FLOW, nameExpression, context.dataFlowInfo); + } + ExpressionTypingContext newContext = receiver.exists() ? context.replaceScope(receiver.getType().getMemberScope()) : context; @@ -624,6 +631,7 @@ public class BasicExpressionTypingVisitor extends ExpressionTypingVisitor { if (jetType == null) { context.trace.report(UNRESOLVED_REFERENCE.on(nameExpression)); } + return jetType; } else if (selectorExpression instanceof JetQualifiedExpression) { diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/PatternMatchingTypingVisitor.java b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/PatternMatchingTypingVisitor.java index df89ce15acc..f68e296f64f 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/PatternMatchingTypingVisitor.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/PatternMatchingTypingVisitor.java @@ -59,7 +59,8 @@ public class PatternMatchingTypingVisitor extends ExpressionTypingVisitor { JetPattern pattern = expression.getPattern(); if (pattern != null) { WritableScopeImpl scopeToExtend = newWritableScopeImpl(context).setDebugName("Scope extended in 'is'"); - DataFlowInfo newDataFlowInfo = checkPatternType(pattern, knownType, false, scopeToExtend, context, DataFlowValueFactory.INSTANCE.createDataFlowValue(leftHandSide, knownType, context.trace.getBindingContext())); + DataFlowValue dataFlowValue = DataFlowValueFactory.INSTANCE.createDataFlowValue(leftHandSide, knownType, context.trace.getBindingContext()); + DataFlowInfo newDataFlowInfo = checkPatternType(pattern, knownType, false, scopeToExtend, context, dataFlowValue); context.patternsToDataFlowInfo.put(pattern, newDataFlowInfo); context.patternsToBoundVariableLists.put(pattern, scopeToExtend.getDeclaredVariables()); } @@ -175,7 +176,9 @@ public class PatternMatchingTypingVisitor extends ExpressionTypingVisitor { return newDataFlowInfo[0]; } - private DataFlowInfo checkPatternType(@NotNull JetPattern pattern, @NotNull final JetType subjectType, final boolean conditionExpected, @NotNull final WritableScope scopeToExtend, final ExpressionTypingContext context, @NotNull final DataFlowValue... subjectVariables) { + private DataFlowInfo checkPatternType(@NotNull JetPattern pattern, @NotNull final JetType subjectType, final boolean conditionExpected, + @NotNull final WritableScope scopeToExtend, final ExpressionTypingContext context, @NotNull final DataFlowValue... subjectVariables + ) { final Ref result = new Ref(context.dataFlowInfo); pattern.accept(new JetVisitorVoid() { @Override diff --git a/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/JavaElementFinder.java b/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/JavaElementFinder.java index 8a45a0774c9..8f5ef1b4234 100644 --- a/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/JavaElementFinder.java +++ b/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/JavaElementFinder.java @@ -32,6 +32,7 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.codegen.JetTypeMapper; import org.jetbrains.jet.lang.psi.*; import org.jetbrains.jet.lang.resolve.FqName; +import org.jetbrains.jet.lang.resolve.java.JavaPsiFacadeKotlinHacks; import org.jetbrains.jet.lang.resolve.java.JetFilesProvider; import org.jetbrains.jet.lang.resolve.java.JvmAbi; import org.jetbrains.jet.util.QualifiedNamesUtil; @@ -41,7 +42,7 @@ import java.util.List; import java.util.Set; import java.util.WeakHashMap; -public class JavaElementFinder extends PsiElementFinder { +public class JavaElementFinder extends PsiElementFinder implements JavaPsiFacadeKotlinHacks.KotlinFinderMarker { private final Project project; private final PsiManager psiManager; diff --git a/compiler/tests/org/jetbrains/jet/codegen/CompileTextTest.java b/compiler/tests/org/jetbrains/jet/codegen/CompileTextTest.java index 3b5b6174c71..84d8b82c38c 100644 --- a/compiler/tests/org/jetbrains/jet/codegen/CompileTextTest.java +++ b/compiler/tests/org/jetbrains/jet/codegen/CompileTextTest.java @@ -18,6 +18,7 @@ package org.jetbrains.jet.codegen; import org.jetbrains.jet.CompileCompilerDependenciesTest; import org.jetbrains.jet.compiler.CompileEnvironment; +import org.jetbrains.jet.compiler.messages.MessageCollector; import org.jetbrains.jet.lang.resolve.java.CompilerSpecialMode; import java.lang.reflect.InvocationTargetException; @@ -26,7 +27,7 @@ import java.lang.reflect.Method; public class CompileTextTest extends CodegenTestCase { public void testMe() throws ClassNotFoundException, NoSuchMethodException, InvocationTargetException, IllegalAccessException { String text = "import org.jetbrains.jet.codegen.CompileTextTest; fun x() = CompileTextTest()"; - CompileEnvironment compileEnvironment = new CompileEnvironment(CompileCompilerDependenciesTest.compilerDependenciesForTests(CompilerSpecialMode.REGULAR)); + CompileEnvironment compileEnvironment = new CompileEnvironment(MessageCollector.PLAIN_TEXT_TO_SYSTEM_ERR, CompileCompilerDependenciesTest.compilerDependenciesForTests(CompilerSpecialMode.REGULAR)); compileEnvironment.getEnvironment().addToClasspathFromClassLoader(getClass().getClassLoader()); ClassLoader classLoader = compileEnvironment.compileText(text); Class namespace = classLoader.loadClass("namespace"); diff --git a/compiler/tests/org/jetbrains/jet/codegen/TestlibTest.java b/compiler/tests/org/jetbrains/jet/codegen/TestlibTest.java index 0196ee196af..fd9e6ce37a3 100644 --- a/compiler/tests/org/jetbrains/jet/codegen/TestlibTest.java +++ b/compiler/tests/org/jetbrains/jet/codegen/TestlibTest.java @@ -23,8 +23,8 @@ import junit.framework.TestCase; import junit.framework.TestSuite; import org.jetbrains.jet.CompileCompilerDependenciesTest; import org.jetbrains.jet.codegen.forTestCompile.ForTestCompileRuntime; -import org.jetbrains.jet.compiler.CompileSession; -import org.jetbrains.jet.compiler.MessageRenderer; +import org.jetbrains.jet.compiler.KotlinToJVMBytecodeCompiler; +import org.jetbrains.jet.compiler.messages.MessageCollector; import org.jetbrains.jet.lang.descriptors.ClassDescriptor; import org.jetbrains.jet.lang.psi.JetClass; import org.jetbrains.jet.lang.psi.JetDeclaration; @@ -37,6 +37,7 @@ import org.jetbrains.jet.lang.types.JetType; import org.jetbrains.jet.parsing.JetParsingTest; import java.io.File; +import java.io.PrintStream; import java.lang.reflect.Constructor; import java.lang.reflect.Modifier; import java.net.URL; @@ -74,10 +75,8 @@ public class TestlibTest extends CodegenTestCase { private TestSuite doBuildSuite() { try { + PrintStream err = System.err; CompilerDependencies compilerDependencies = CompileCompilerDependenciesTest.compilerDependenciesForTests(CompilerSpecialMode.REGULAR); - CompileSession session = new CompileSession(myEnvironment, MessageRenderer.PLAIN, System.err, false, - compilerDependencies); - File junitJar = new File("libraries/lib/junit-4.9.jar"); if (!junitJar.exists()) { @@ -92,19 +91,21 @@ public class TestlibTest extends CodegenTestCase { myEnvironment.addSources(localFileSystem.findFileByPath(JetParsingTest.getTestDataDir() + "/../../libraries/stdlib/test")); myEnvironment.addSources(localFileSystem.findFileByPath(JetParsingTest.getTestDataDir() + "/../../libraries/kunit/src")); - if (!session.analyze()) { + GenerationState generationState = KotlinToJVMBytecodeCompiler + .analyzeAndGenerate(myEnvironment, compilerDependencies, MessageCollector.PLAIN_TEXT_TO_SYSTEM_ERR, false); + + if (generationState == null) { throw new RuntimeException("There were compilation errors"); } - GenerationState state = session.generate(false); - ClassFileFactory classFileFactory = state.getFactory(); + ClassFileFactory classFileFactory = generationState.getFactory(); final GeneratedClassLoader loader = new GeneratedClassLoader( classFileFactory, new URLClassLoader(new URL[]{ForTestCompileRuntime.runtimeJarForTests().toURI().toURL(), junitJar.toURI().toURL()}, TestCase.class.getClassLoader())); - JetTypeMapper typeMapper = state.getInjector().getJetTypeMapper(); + JetTypeMapper typeMapper = generationState.getInjector().getJetTypeMapper(); TestSuite suite = new TestSuite("stdlib_test"); try { for(JetFile jetFile : myEnvironment.getSourceFiles()) { @@ -112,7 +113,7 @@ public class TestlibTest extends CodegenTestCase { if(decl instanceof JetClass) { JetClass jetClass = (JetClass) decl; - ClassDescriptor descriptor = (ClassDescriptor) session.getBindingContext().getBindingContext().get(BindingContext.DECLARATION_TO_DESCRIPTOR, jetClass); + ClassDescriptor descriptor = (ClassDescriptor) generationState.getBindingContext().get(BindingContext.DECLARATION_TO_DESCRIPTOR, jetClass); Set allSuperTypes = new THashSet(); DescriptorUtils.addSuperTypes(descriptor.getDefaultType(), allSuperTypes); diff --git a/compiler/tests/org/jetbrains/jet/compiler/CompileEnvironmentTest.java b/compiler/tests/org/jetbrains/jet/compiler/CompileEnvironmentTest.java index 11895e7c662..15258f3503a 100644 --- a/compiler/tests/org/jetbrains/jet/compiler/CompileEnvironmentTest.java +++ b/compiler/tests/org/jetbrains/jet/compiler/CompileEnvironmentTest.java @@ -18,11 +18,9 @@ package org.jetbrains.jet.compiler; import com.intellij.openapi.util.io.FileUtil; import junit.framework.TestCase; -import org.jetbrains.jet.CompileCompilerDependenciesTest; import org.jetbrains.jet.cli.KotlinCompiler; import org.jetbrains.jet.codegen.forTestCompile.ForTestCompileJdkHeaders; import org.jetbrains.jet.codegen.forTestCompile.ForTestCompileRuntime; -import org.jetbrains.jet.lang.resolve.java.CompilerSpecialMode; import org.jetbrains.jet.parsing.JetParsingTest; import org.junit.Assert; @@ -47,11 +45,11 @@ public class CompileEnvironmentTest extends TestCase { File stdlib = ForTestCompileRuntime.runtimeJarForTests(); File jdkHeaders = ForTestCompileJdkHeaders.jdkHeadersForTests(); File resultJar = new File(tempDir, "result.jar"); - KotlinCompiler.ExitCode rv = new KotlinCompiler().exec( - "-module", JetParsingTest.getTestDataDir() + "/compiler/smoke/Smoke.kts", - "-jar", resultJar.getAbsolutePath(), - "-stdlib", stdlib.getAbsolutePath(), - "-jdkHeaders", jdkHeaders.getAbsolutePath()); + KotlinCompiler.ExitCode rv = new KotlinCompiler().exec(System.out, + "-module", JetParsingTest.getTestDataDir() + "/compiler/smoke/Smoke.kts", + "-jar", resultJar.getAbsolutePath(), + "-stdlib", stdlib.getAbsolutePath(), + "-jdkHeaders", jdkHeaders.getAbsolutePath()); Assert.assertEquals("compilation completed with non-zero code", KotlinCompiler.ExitCode.OK, rv); FileInputStream fileInputStream = new FileInputStream(resultJar); try { @@ -80,11 +78,9 @@ public class CompileEnvironmentTest extends TestCase { File out = new File(tempDir, "out"); File stdlib = ForTestCompileRuntime.runtimeJarForTests(); File jdkHeaders = ForTestCompileJdkHeaders.jdkHeadersForTests(); - KotlinCompiler.ExitCode exitCode = new KotlinCompiler().exec( - "-src", JetParsingTest.getTestDataDir() + "/compiler/smoke/Smoke.kt", - "-output", out.getAbsolutePath(), - "-stdlib", stdlib.getAbsolutePath(), - "-jdkHeaders", jdkHeaders.getAbsolutePath()); + KotlinCompiler.ExitCode exitCode = new KotlinCompiler() + .exec(System.out, "-src", JetParsingTest.getTestDataDir() + "/compiler/smoke/Smoke.kt", "-output", + out.getAbsolutePath(), "-stdlib", stdlib.getAbsolutePath(), "-jdkHeaders", jdkHeaders.getAbsolutePath()); Assert.assertEquals(KotlinCompiler.ExitCode.OK, exitCode); assertEquals(1, out.listFiles().length); assertEquals(1, out.listFiles()[0].listFiles().length); diff --git a/idea/idea.iml b/idea/idea.iml index 19d7ef288cb..aeee35abdbd 100644 --- a/idea/idea.iml +++ b/idea/idea.iml @@ -27,7 +27,7 @@ - + diff --git a/idea/src/org/jetbrains/jet/plugin/compiler/JetCompiler.java b/idea/src/org/jetbrains/jet/plugin/compiler/JetCompiler.java index 775430e425f..6e337505b1e 100644 --- a/idea/src/org/jetbrains/jet/plugin/compiler/JetCompiler.java +++ b/idea/src/org/jetbrains/jet/plugin/compiler/JetCompiler.java @@ -42,7 +42,6 @@ import com.intellij.util.Chunk; import com.intellij.util.SystemProperties; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.diagnostics.Severity; import org.jetbrains.jet.plugin.JetFileType; import org.jetbrains.jet.utils.PathUtil; @@ -446,15 +445,17 @@ public class JetCompiler implements TranslatingCompiler { private String message; public void setMessageCategoryFromString(String tagName) { - boolean exception = "EXCEPTION".equals(tagName); - if (Severity.ERROR.toString().equals(tagName) || exception) { + if ("ERROR".equals(tagName)) { messageCategory = ERROR; - isException = exception; } - else if (Severity.WARNING.toString().equals(tagName)) { + else if ("EXCEPTION".equals(tagName)) { + messageCategory = ERROR; + isException = true; + } + else if ("WARNING".equals(tagName)) { messageCategory = WARNING; } - else if (Severity.LOGGING.toString().equals(tagName)) { + else if ("LOGGING".equals(tagName)) { messageCategory = STATISTICS; } else { diff --git a/idea/testData/completion/basic/AutoCastAfterIf.kt b/idea/testData/completion/basic/AutoCastAfterIf.kt new file mode 100644 index 00000000000..053908d80ad --- /dev/null +++ b/idea/testData/completion/basic/AutoCastAfterIf.kt @@ -0,0 +1,14 @@ +trait Expr +class Num(val value : Int) : Expr + +fun eval(e : Expr) { + if (e is Num) { + return e. + } +} + +// EXIST: value + + + + diff --git a/idea/testData/completion/basic/AutoCastAfterIfMethod.kt b/idea/testData/completion/basic/AutoCastAfterIfMethod.kt new file mode 100644 index 00000000000..d3ce17519fb --- /dev/null +++ b/idea/testData/completion/basic/AutoCastAfterIfMethod.kt @@ -0,0 +1,12 @@ +class Expr {} +class Num : Expr() { + fun testing() {} +} + +fun eval(e : Expr) { + if (e is Num) { + return e.() + } +} + +// EXIST: testing \ No newline at end of file diff --git a/idea/testData/completion/basic/AutoCastForThis.kt b/idea/testData/completion/basic/AutoCastForThis.kt new file mode 100644 index 00000000000..d77a1be3a7c --- /dev/null +++ b/idea/testData/completion/basic/AutoCastForThis.kt @@ -0,0 +1,11 @@ +trait Expr { + public fun testThis() { + if (this is Num) { + this. + } + } +} + +class Num(val toCheck : Int) : Expr + +// EXIST: toCheck \ No newline at end of file diff --git a/idea/testData/completion/basic/AutoCastInWhen.kt b/idea/testData/completion/basic/AutoCastInWhen.kt new file mode 100644 index 00000000000..4d5ce298e6b --- /dev/null +++ b/idea/testData/completion/basic/AutoCastInWhen.kt @@ -0,0 +1,8 @@ +trait Expr +class Sum(val left : Expr, val right : Expr) : Expr + +fun evalWhen(e : Expr) : Int = when (e) { + is Sum -> e. +} + +// EXIST: left, right \ No newline at end of file diff --git a/idea/testData/completion/basic/CallLocalLambda.kt b/idea/testData/completion/basic/CallLocalLambda.kt new file mode 100644 index 00000000000..2b80b2c859e --- /dev/null +++ b/idea/testData/completion/basic/CallLocalLambda.kt @@ -0,0 +1,11 @@ +class TestClass { + public fun testMethod() { + } +} + +fun testFun() { + val lambda = {() -> TestClass() } + lambda(). +} + +// EXIST: testMethod \ No newline at end of file diff --git a/idea/testData/completion/basic/InCallExpression.kt b/idea/testData/completion/basic/InCallExpression.kt index 3d8347cfd30..16fad2dbc1c 100644 --- a/idea/testData/completion/basic/InCallExpression.kt +++ b/idea/testData/completion/basic/InCallExpression.kt @@ -1,13 +1,13 @@ package something class SomeTempClass { - fun testSome() { + fun helloWorld() { } fun test() { - test() + hello() } } -// EXIST: test, testSome \ No newline at end of file +// EXIST: helloWorld \ No newline at end of file diff --git a/idea/tests/org/jetbrains/jet/completion/JetBasicCompletionTest.java b/idea/tests/org/jetbrains/jet/completion/JetBasicCompletionTest.java index fd826cbc4b4..5cc1ece871a 100644 --- a/idea/tests/org/jetbrains/jet/completion/JetBasicCompletionTest.java +++ b/idea/tests/org/jetbrains/jet/completion/JetBasicCompletionTest.java @@ -25,6 +25,22 @@ import java.io.File; */ public class JetBasicCompletionTest extends JetCompletionTestBase { + public void testAutoCastAfterIf() { + doTest(); + } + + public void testAutoCastAfterIfMethod() { + doTest(); + } + + public void testAutoCastForThis() { + doTest(); + } + + public void testAutoCastInWhen() { + doTest(); + } + public void testBasicAny() { doTest(); } @@ -37,6 +53,10 @@ public class JetBasicCompletionTest extends JetCompletionTestBase { doTest(); } + public void testCallLocalLambda() { + doTest(); + } + public void testExtendClassName() { doTest(); } @@ -101,7 +121,7 @@ public class JetBasicCompletionTest extends JetCompletionTestBase { doTest(); } - public void testNoCLassNameDuplication() { + public void testNoClassNameDuplication() { doTest(); } diff --git a/idea/tests/org/jetbrains/jet/plugin/libraries/AbstractLibrariesTest.java b/idea/tests/org/jetbrains/jet/plugin/libraries/AbstractLibrariesTest.java index 5cfbe35d52d..d534e506ec2 100644 --- a/idea/tests/org/jetbrains/jet/plugin/libraries/AbstractLibrariesTest.java +++ b/idea/tests/org/jetbrains/jet/plugin/libraries/AbstractLibrariesTest.java @@ -60,7 +60,8 @@ public abstract class AbstractLibrariesTest extends PlatformTestCase { }); librarySourceDir = LocalFileSystem.getInstance().findFileByPath(TEST_DATA_PATH + "/library"); assertNotNull(librarySourceDir); - KotlinCompiler.ExitCode compilerExec = new KotlinCompiler().exec("-src", librarySourceDir.getPath(), "-output", libraryIoDir.getAbsolutePath()); + KotlinCompiler.ExitCode compilerExec = + new KotlinCompiler().exec(System.out, "-src", librarySourceDir.getPath(), "-output", libraryIoDir.getAbsolutePath()); assertEquals(KotlinCompiler.ExitCode.OK, compilerExec); libraryDir = LocalFileSystem.getInstance().findFileByIoFile(libraryIoDir); assertNotNull(libraryDir); diff --git a/libraries/docs/apidoc/pom.xml b/libraries/docs/apidoc/pom.xml index 77db2cd1123..b36fb318c9d 100644 --- a/libraries/docs/apidoc/pom.xml +++ b/libraries/docs/apidoc/pom.xml @@ -49,8 +49,29 @@ jet junit org + kotlin.support + kotlin.properties - + https://github.com/JetBrains/kotlin/tree/master + ${project-root} + + ${project-root}/libraries/kotlin-swing/ReadMe.md + + + Core API + Functions for working with Java Beans + Concurrent programing API + Functions for working with the W3C DOM + IO API for working with files and streams + Functions for working with SQL databases via JDBC (in kotlin-jdbc module) + Mathematics API + API for defining compilation units + Functions for treating nullable types as composable collections of zero or one element + Swing API (in kotlin-swing module) + Text processing API + Functions for writing tests (in kunit module) + Utility functions + diff --git a/libraries/docs/website/src/main/apidocs/js/apidoc.js b/libraries/docs/website/src/main/apidocs/js/apidoc.js new file mode 100644 index 00000000000..d6a3f6ab336 --- /dev/null +++ b/libraries/docs/website/src/main/apidocs/js/apidoc.js @@ -0,0 +1,8 @@ +// This execute once the document loads. +$(function(){ + $("div.source-detail").hide(); + $("div.doc-member").hover( + function() { $(this).children("div.source-detail").show(); }, + function() { $(this).children("div.source-detail").hide(); } + ); +}); \ No newline at end of file diff --git a/libraries/docs/website/src/main/apidocs/js/jquery.js b/libraries/docs/website/src/main/apidocs/js/jquery.js new file mode 100644 index 00000000000..16ad06c5aca --- /dev/null +++ b/libraries/docs/website/src/main/apidocs/js/jquery.js @@ -0,0 +1,4 @@ +/*! jQuery v1.7.2 jquery.com | jquery.org/license */ +(function(a,b){function cy(a){return f.isWindow(a)?a:a.nodeType===9?a.defaultView||a.parentWindow:!1}function cu(a){if(!cj[a]){var b=c.body,d=f("<"+a+">").appendTo(b),e=d.css("display");d.remove();if(e==="none"||e===""){ck||(ck=c.createElement("iframe"),ck.frameBorder=ck.width=ck.height=0),b.appendChild(ck);if(!cl||!ck.createElement)cl=(ck.contentWindow||ck.contentDocument).document,cl.write((f.support.boxModel?"":"")+""),cl.close();d=cl.createElement(a),cl.body.appendChild(d),e=f.css(d,"display"),b.removeChild(ck)}cj[a]=e}return cj[a]}function ct(a,b){var c={};f.each(cp.concat.apply([],cp.slice(0,b)),function(){c[this]=a});return c}function cs(){cq=b}function cr(){setTimeout(cs,0);return cq=f.now()}function ci(){try{return new a.ActiveXObject("Microsoft.XMLHTTP")}catch(b){}}function ch(){try{return new a.XMLHttpRequest}catch(b){}}function cb(a,c){a.dataFilter&&(c=a.dataFilter(c,a.dataType));var d=a.dataTypes,e={},g,h,i=d.length,j,k=d[0],l,m,n,o,p;for(g=1;g0){if(c!=="border")for(;e=0===c})}function S(a){return!a||!a.parentNode||a.parentNode.nodeType===11}function K(){return!0}function J(){return!1}function n(a,b,c){var d=b+"defer",e=b+"queue",g=b+"mark",h=f._data(a,d);h&&(c==="queue"||!f._data(a,e))&&(c==="mark"||!f._data(a,g))&&setTimeout(function(){!f._data(a,e)&&!f._data(a,g)&&(f.removeData(a,d,!0),h.fire())},0)}function m(a){for(var b in a){if(b==="data"&&f.isEmptyObject(a[b]))continue;if(b!=="toJSON")return!1}return!0}function l(a,c,d){if(d===b&&a.nodeType===1){var e="data-"+c.replace(k,"-$1").toLowerCase();d=a.getAttribute(e);if(typeof d=="string"){try{d=d==="true"?!0:d==="false"?!1:d==="null"?null:f.isNumeric(d)?+d:j.test(d)?f.parseJSON(d):d}catch(g){}f.data(a,c,d)}else d=b}return d}function h(a){var b=g[a]={},c,d;a=a.split(/\s+/);for(c=0,d=a.length;c)[^>]*$|#([\w\-]*)$)/,j=/\S/,k=/^\s+/,l=/\s+$/,m=/^<(\w+)\s*\/?>(?:<\/\1>)?$/,n=/^[\],:{}\s]*$/,o=/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,p=/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,q=/(?:^|:|,)(?:\s*\[)+/g,r=/(webkit)[ \/]([\w.]+)/,s=/(opera)(?:.*version)?[ \/]([\w.]+)/,t=/(msie) ([\w.]+)/,u=/(mozilla)(?:.*? rv:([\w.]+))?/,v=/-([a-z]|[0-9])/ig,w=/^-ms-/,x=function(a,b){return(b+"").toUpperCase()},y=d.userAgent,z,A,B,C=Object.prototype.toString,D=Object.prototype.hasOwnProperty,E=Array.prototype.push,F=Array.prototype.slice,G=String.prototype.trim,H=Array.prototype.indexOf,I={};e.fn=e.prototype={constructor:e,init:function(a,d,f){var g,h,j,k;if(!a)return this;if(a.nodeType){this.context=this[0]=a,this.length=1;return this}if(a==="body"&&!d&&c.body){this.context=c,this[0]=c.body,this.selector=a,this.length=1;return this}if(typeof a=="string"){a.charAt(0)!=="<"||a.charAt(a.length-1)!==">"||a.length<3?g=i.exec(a):g=[null,a,null];if(g&&(g[1]||!d)){if(g[1]){d=d instanceof e?d[0]:d,k=d?d.ownerDocument||d:c,j=m.exec(a),j?e.isPlainObject(d)?(a=[c.createElement(j[1])],e.fn.attr.call(a,d,!0)):a=[k.createElement(j[1])]:(j=e.buildFragment([g[1]],[k]),a=(j.cacheable?e.clone(j.fragment):j.fragment).childNodes);return e.merge(this,a)}h=c.getElementById(g[2]);if(h&&h.parentNode){if(h.id!==g[2])return f.find(a);this.length=1,this[0]=h}this.context=c,this.selector=a;return this}return!d||d.jquery?(d||f).find(a):this.constructor(d).find(a)}if(e.isFunction(a))return f.ready(a);a.selector!==b&&(this.selector=a.selector,this.context=a.context);return e.makeArray(a,this)},selector:"",jquery:"1.7.2",length:0,size:function(){return this.length},toArray:function(){return F.call(this,0)},get:function(a){return a==null?this.toArray():a<0?this[this.length+a]:this[a]},pushStack:function(a,b,c){var d=this.constructor();e.isArray(a)?E.apply(d,a):e.merge(d,a),d.prevObject=this,d.context=this.context,b==="find"?d.selector=this.selector+(this.selector?" ":"")+c:b&&(d.selector=this.selector+"."+b+"("+c+")");return d},each:function(a,b){return e.each(this,a,b)},ready:function(a){e.bindReady(),A.add(a);return this},eq:function(a){a=+a;return a===-1?this.slice(a):this.slice(a,a+1)},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},slice:function(){return this.pushStack(F.apply(this,arguments),"slice",F.call(arguments).join(","))},map:function(a){return this.pushStack(e.map(this,function(b,c){return a.call(b,c,b)}))},end:function(){return this.prevObject||this.constructor(null)},push:E,sort:[].sort,splice:[].splice},e.fn.init.prototype=e.fn,e.extend=e.fn.extend=function(){var a,c,d,f,g,h,i=arguments[0]||{},j=1,k=arguments.length,l=!1;typeof i=="boolean"&&(l=i,i=arguments[1]||{},j=2),typeof i!="object"&&!e.isFunction(i)&&(i={}),k===j&&(i=this,--j);for(;j0)return;A.fireWith(c,[e]),e.fn.trigger&&e(c).trigger("ready").off("ready")}},bindReady:function(){if(!A){A=e.Callbacks("once memory");if(c.readyState==="complete")return setTimeout(e.ready,1);if(c.addEventListener)c.addEventListener("DOMContentLoaded",B,!1),a.addEventListener("load",e.ready,!1);else if(c.attachEvent){c.attachEvent("onreadystatechange",B),a.attachEvent("onload",e.ready);var b=!1;try{b=a.frameElement==null}catch(d){}c.documentElement.doScroll&&b&&J()}}},isFunction:function(a){return e.type(a)==="function"},isArray:Array.isArray||function(a){return e.type(a)==="array"},isWindow:function(a){return a!=null&&a==a.window},isNumeric:function(a){return!isNaN(parseFloat(a))&&isFinite(a)},type:function(a){return a==null?String(a):I[C.call(a)]||"object"},isPlainObject:function(a){if(!a||e.type(a)!=="object"||a.nodeType||e.isWindow(a))return!1;try{if(a.constructor&&!D.call(a,"constructor")&&!D.call(a.constructor.prototype,"isPrototypeOf"))return!1}catch(c){return!1}var d;for(d in a);return d===b||D.call(a,d)},isEmptyObject:function(a){for(var b in a)return!1;return!0},error:function(a){throw new Error(a)},parseJSON:function(b){if(typeof b!="string"||!b)return null;b=e.trim(b);if(a.JSON&&a.JSON.parse)return a.JSON.parse(b);if(n.test(b.replace(o,"@").replace(p,"]").replace(q,"")))return(new Function("return "+b))();e.error("Invalid JSON: "+b)},parseXML:function(c){if(typeof c!="string"||!c)return null;var d,f;try{a.DOMParser?(f=new DOMParser,d=f.parseFromString(c,"text/xml")):(d=new ActiveXObject("Microsoft.XMLDOM"),d.async="false",d.loadXML(c))}catch(g){d=b}(!d||!d.documentElement||d.getElementsByTagName("parsererror").length)&&e.error("Invalid XML: "+c);return d},noop:function(){},globalEval:function(b){b&&j.test(b)&&(a.execScript||function(b){a.eval.call(a,b)})(b)},camelCase:function(a){return a.replace(w,"ms-").replace(v,x)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toUpperCase()===b.toUpperCase()},each:function(a,c,d){var f,g=0,h=a.length,i=h===b||e.isFunction(a);if(d){if(i){for(f in a)if(c.apply(a[f],d)===!1)break}else for(;g0&&a[0]&&a[j-1]||j===0||e.isArray(a));if(k)for(;i1?i.call(arguments,0):b,j.notifyWith(k,e)}}function l(a){return function(c){b[a]=arguments.length>1?i.call(arguments,0):c,--g||j.resolveWith(j,b)}}var b=i.call(arguments,0),c=0,d=b.length,e=Array(d),g=d,h=d,j=d<=1&&a&&f.isFunction(a.promise)?a:f.Deferred(),k=j.promise();if(d>1){for(;c
a",d=p.getElementsByTagName("*"),e=p.getElementsByTagName("a")[0];if(!d||!d.length||!e)return{};g=c.createElement("select"),h=g.appendChild(c.createElement("option")),i=p.getElementsByTagName("input")[0],b={leadingWhitespace:p.firstChild.nodeType===3,tbody:!p.getElementsByTagName("tbody").length,htmlSerialize:!!p.getElementsByTagName("link").length,style:/top/.test(e.getAttribute("style")),hrefNormalized:e.getAttribute("href")==="/a",opacity:/^0.55/.test(e.style.opacity),cssFloat:!!e.style.cssFloat,checkOn:i.value==="on",optSelected:h.selected,getSetAttribute:p.className!=="t",enctype:!!c.createElement("form").enctype,html5Clone:c.createElement("nav").cloneNode(!0).outerHTML!=="<:nav>",submitBubbles:!0,changeBubbles:!0,focusinBubbles:!1,deleteExpando:!0,noCloneEvent:!0,inlineBlockNeedsLayout:!1,shrinkWrapBlocks:!1,reliableMarginRight:!0,pixelMargin:!0},f.boxModel=b.boxModel=c.compatMode==="CSS1Compat",i.checked=!0,b.noCloneChecked=i.cloneNode(!0).checked,g.disabled=!0,b.optDisabled=!h.disabled;try{delete p.test}catch(r){b.deleteExpando=!1}!p.addEventListener&&p.attachEvent&&p.fireEvent&&(p.attachEvent("onclick",function(){b.noCloneEvent=!1}),p.cloneNode(!0).fireEvent("onclick")),i=c.createElement("input"),i.value="t",i.setAttribute("type","radio"),b.radioValue=i.value==="t",i.setAttribute("checked","checked"),i.setAttribute("name","t"),p.appendChild(i),j=c.createDocumentFragment(),j.appendChild(p.lastChild),b.checkClone=j.cloneNode(!0).cloneNode(!0).lastChild.checked,b.appendChecked=i.checked,j.removeChild(i),j.appendChild(p);if(p.attachEvent)for(n in{submit:1,change:1,focusin:1})m="on"+n,o=m in p,o||(p.setAttribute(m,"return;"),o=typeof p[m]=="function"),b[n+"Bubbles"]=o;j.removeChild(p),j=g=h=p=i=null,f(function(){var d,e,g,h,i,j,l,m,n,q,r,s,t,u=c.getElementsByTagName("body")[0];!u||(m=1,t="padding:0;margin:0;border:",r="position:absolute;top:0;left:0;width:1px;height:1px;",s=t+"0;visibility:hidden;",n="style='"+r+t+"5px solid #000;",q="
"+""+"
",d=c.createElement("div"),d.style.cssText=s+"width:0;height:0;position:static;top:0;margin-top:"+m+"px",u.insertBefore(d,u.firstChild),p=c.createElement("div"),d.appendChild(p),p.innerHTML="
t
",k=p.getElementsByTagName("td"),o=k[0].offsetHeight===0,k[0].style.display="",k[1].style.display="none",b.reliableHiddenOffsets=o&&k[0].offsetHeight===0,a.getComputedStyle&&(p.innerHTML="",l=c.createElement("div"),l.style.width="0",l.style.marginRight="0",p.style.width="2px",p.appendChild(l),b.reliableMarginRight=(parseInt((a.getComputedStyle(l,null)||{marginRight:0}).marginRight,10)||0)===0),typeof p.style.zoom!="undefined"&&(p.innerHTML="",p.style.width=p.style.padding="1px",p.style.border=0,p.style.overflow="hidden",p.style.display="inline",p.style.zoom=1,b.inlineBlockNeedsLayout=p.offsetWidth===3,p.style.display="block",p.style.overflow="visible",p.innerHTML="
",b.shrinkWrapBlocks=p.offsetWidth!==3),p.style.cssText=r+s,p.innerHTML=q,e=p.firstChild,g=e.firstChild,i=e.nextSibling.firstChild.firstChild,j={doesNotAddBorder:g.offsetTop!==5,doesAddBorderForTableAndCells:i.offsetTop===5},g.style.position="fixed",g.style.top="20px",j.fixedPosition=g.offsetTop===20||g.offsetTop===15,g.style.position=g.style.top="",e.style.overflow="hidden",e.style.position="relative",j.subtractsBorderForOverflowNotVisible=g.offsetTop===-5,j.doesNotIncludeMarginInBodyOffset=u.offsetTop!==m,a.getComputedStyle&&(p.style.marginTop="1%",b.pixelMargin=(a.getComputedStyle(p,null)||{marginTop:0}).marginTop!=="1%"),typeof d.style.zoom!="undefined"&&(d.style.zoom=1),u.removeChild(d),l=p=d=null,f.extend(b,j))});return b}();var j=/^(?:\{.*\}|\[.*\])$/,k=/([A-Z])/g;f.extend({cache:{},uuid:0,expando:"jQuery"+(f.fn.jquery+Math.random()).replace(/\D/g,""),noData:{embed:!0,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",applet:!0},hasData:function(a){a=a.nodeType?f.cache[a[f.expando]]:a[f.expando];return!!a&&!m(a)},data:function(a,c,d,e){if(!!f.acceptData(a)){var g,h,i,j=f.expando,k=typeof c=="string",l=a.nodeType,m=l?f.cache:a,n=l?a[j]:a[j]&&j,o=c==="events";if((!n||!m[n]||!o&&!e&&!m[n].data)&&k&&d===b)return;n||(l?a[j]=n=++f.uuid:n=j),m[n]||(m[n]={},l||(m[n].toJSON=f.noop));if(typeof c=="object"||typeof c=="function")e?m[n]=f.extend(m[n],c):m[n].data=f.extend(m[n].data,c);g=h=m[n],e||(h.data||(h.data={}),h=h.data),d!==b&&(h[f.camelCase(c)]=d);if(o&&!h[c])return g.events;k?(i=h[c],i==null&&(i=h[f.camelCase(c)])):i=h;return i}},removeData:function(a,b,c){if(!!f.acceptData(a)){var d,e,g,h=f.expando,i=a.nodeType,j=i?f.cache:a,k=i?a[h]:h;if(!j[k])return;if(b){d=c?j[k]:j[k].data;if(d){f.isArray(b)||(b in d?b=[b]:(b=f.camelCase(b),b in d?b=[b]:b=b.split(" ")));for(e=0,g=b.length;e1,null,!1)},removeData:function(a){return this.each(function(){f.removeData(this,a)})}}),f.extend({_mark:function(a,b){a&&(b=(b||"fx")+"mark",f._data(a,b,(f._data(a,b)||0)+1))},_unmark:function(a,b,c){a!==!0&&(c=b,b=a,a=!1);if(b){c=c||"fx";var d=c+"mark",e=a?0:(f._data(b,d)||1)-1;e?f._data(b,d,e):(f.removeData(b,d,!0),n(b,c,"mark"))}},queue:function(a,b,c){var d;if(a){b=(b||"fx")+"queue",d=f._data(a,b),c&&(!d||f.isArray(c)?d=f._data(a,b,f.makeArray(c)):d.push(c));return d||[]}},dequeue:function(a,b){b=b||"fx";var c=f.queue(a,b),d=c.shift(),e={};d==="inprogress"&&(d=c.shift()),d&&(b==="fx"&&c.unshift("inprogress"),f._data(a,b+".run",e),d.call(a,function(){f.dequeue(a,b)},e)),c.length||(f.removeData(a,b+"queue "+b+".run",!0),n(a,b,"queue"))}}),f.fn.extend({queue:function(a,c){var d=2;typeof a!="string"&&(c=a,a="fx",d--);if(arguments.length1)},removeAttr:function(a){return this.each(function(){f.removeAttr(this,a)})},prop:function(a,b){return f.access(this,f.prop,a,b,arguments.length>1)},removeProp:function(a){a=f.propFix[a]||a;return this.each(function(){try{this[a]=b,delete this[a]}catch(c){}})},addClass:function(a){var b,c,d,e,g,h,i;if(f.isFunction(a))return this.each(function(b){f(this).addClass(a.call(this,b,this.className))});if(a&&typeof a=="string"){b=a.split(p);for(c=0,d=this.length;c-1)return!0;return!1},val:function(a){var c,d,e,g=this[0];{if(!!arguments.length){e=f.isFunction(a);return this.each(function(d){var g=f(this),h;if(this.nodeType===1){e?h=a.call(this,d,g.val()):h=a,h==null?h="":typeof h=="number"?h+="":f.isArray(h)&&(h=f.map(h,function(a){return a==null?"":a+""})),c=f.valHooks[this.type]||f.valHooks[this.nodeName.toLowerCase()];if(!c||!("set"in c)||c.set(this,h,"value")===b)this.value=h}})}if(g){c=f.valHooks[g.type]||f.valHooks[g.nodeName.toLowerCase()];if(c&&"get"in c&&(d=c.get(g,"value"))!==b)return d;d=g.value;return typeof d=="string"?d.replace(q,""):d==null?"":d}}}}),f.extend({valHooks:{option:{get:function(a){var b=a.attributes.value;return!b||b.specified?a.value:a.text}},select:{get:function(a){var b,c,d,e,g=a.selectedIndex,h=[],i=a.options,j=a.type==="select-one";if(g<0)return null;c=j?g:0,d=j?g+1:i.length;for(;c=0}),c.length||(a.selectedIndex=-1);return c}}},attrFn:{val:!0,css:!0,html:!0,text:!0,data:!0,width:!0,height:!0,offset:!0},attr:function(a,c,d,e){var g,h,i,j=a.nodeType;if(!!a&&j!==3&&j!==8&&j!==2){if(e&&c in f.attrFn)return f(a)[c](d);if(typeof a.getAttribute=="undefined")return f.prop(a,c,d);i=j!==1||!f.isXMLDoc(a),i&&(c=c.toLowerCase(),h=f.attrHooks[c]||(u.test(c)?x:w));if(d!==b){if(d===null){f.removeAttr(a,c);return}if(h&&"set"in h&&i&&(g=h.set(a,d,c))!==b)return g;a.setAttribute(c,""+d);return d}if(h&&"get"in h&&i&&(g=h.get(a,c))!==null)return g;g=a.getAttribute(c);return g===null?b:g}},removeAttr:function(a,b){var c,d,e,g,h,i=0;if(b&&a.nodeType===1){d=b.toLowerCase().split(p),g=d.length;for(;i=0}})});var z=/^(?:textarea|input|select)$/i,A=/^([^\.]*)?(?:\.(.+))?$/,B=/(?:^|\s)hover(\.\S+)?\b/,C=/^key/,D=/^(?:mouse|contextmenu)|click/,E=/^(?:focusinfocus|focusoutblur)$/,F=/^(\w*)(?:#([\w\-]+))?(?:\.([\w\-]+))?$/,G=function( +a){var b=F.exec(a);b&&(b[1]=(b[1]||"").toLowerCase(),b[3]=b[3]&&new RegExp("(?:^|\\s)"+b[3]+"(?:\\s|$)"));return b},H=function(a,b){var c=a.attributes||{};return(!b[1]||a.nodeName.toLowerCase()===b[1])&&(!b[2]||(c.id||{}).value===b[2])&&(!b[3]||b[3].test((c["class"]||{}).value))},I=function(a){return f.event.special.hover?a:a.replace(B,"mouseenter$1 mouseleave$1")};f.event={add:function(a,c,d,e,g){var h,i,j,k,l,m,n,o,p,q,r,s;if(!(a.nodeType===3||a.nodeType===8||!c||!d||!(h=f._data(a)))){d.handler&&(p=d,d=p.handler,g=p.selector),d.guid||(d.guid=f.guid++),j=h.events,j||(h.events=j={}),i=h.handle,i||(h.handle=i=function(a){return typeof f!="undefined"&&(!a||f.event.triggered!==a.type)?f.event.dispatch.apply(i.elem,arguments):b},i.elem=a),c=f.trim(I(c)).split(" ");for(k=0;k=0&&(h=h.slice(0,-1),k=!0),h.indexOf(".")>=0&&(i=h.split("."),h=i.shift(),i.sort());if((!e||f.event.customEvent[h])&&!f.event.global[h])return;c=typeof c=="object"?c[f.expando]?c:new f.Event(h,c):new f.Event(h),c.type=h,c.isTrigger=!0,c.exclusive=k,c.namespace=i.join("."),c.namespace_re=c.namespace?new RegExp("(^|\\.)"+i.join("\\.(?:.*\\.)?")+"(\\.|$)"):null,o=h.indexOf(":")<0?"on"+h:"";if(!e){j=f.cache;for(l in j)j[l].events&&j[l].events[h]&&f.event.trigger(c,d,j[l].handle.elem,!0);return}c.result=b,c.target||(c.target=e),d=d!=null?f.makeArray(d):[],d.unshift(c),p=f.event.special[h]||{};if(p.trigger&&p.trigger.apply(e,d)===!1)return;r=[[e,p.bindType||h]];if(!g&&!p.noBubble&&!f.isWindow(e)){s=p.delegateType||h,m=E.test(s+h)?e:e.parentNode,n=null;for(;m;m=m.parentNode)r.push([m,s]),n=m;n&&n===e.ownerDocument&&r.push([n.defaultView||n.parentWindow||a,s])}for(l=0;le&&j.push({elem:this,matches:d.slice(e)});for(k=0;k0?this.on(b,null,a,c):this.trigger(b)},f.attrFn&&(f.attrFn[b]=!0),C.test(b)&&(f.event.fixHooks[b]=f.event.keyHooks),D.test(b)&&(f.event.fixHooks[b]=f.event.mouseHooks)}),function(){function x(a,b,c,e,f,g){for(var h=0,i=e.length;h0){k=j;break}}j=j[a]}e[h]=k}}}function w(a,b,c,e,f,g){for(var h=0,i=e.length;h+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,d="sizcache"+(Math.random()+"").replace(".",""),e=0,g=Object.prototype.toString,h=!1,i=!0,j=/\\/g,k=/\r\n/g,l=/\W/;[0,0].sort(function(){i=!1;return 0});var m=function(b,d,e,f){e=e||[],d=d||c;var h=d;if(d.nodeType!==1&&d.nodeType!==9)return[];if(!b||typeof b!="string")return e;var i,j,k,l,n,q,r,t,u=!0,v=m.isXML(d),w=[],x=b;do{a.exec(""),i=a.exec(x);if(i){x=i[3],w.push(i[1]);if(i[2]){l=i[3];break}}}while(i);if(w.length>1&&p.exec(b))if(w.length===2&&o.relative[w[0]])j=y(w[0]+w[1],d,f);else{j=o.relative[w[0]]?[d]:m(w.shift(),d);while(w.length)b=w.shift(),o.relative[b]&&(b+=w.shift()),j=y(b,j,f)}else{!f&&w.length>1&&d.nodeType===9&&!v&&o.match.ID.test(w[0])&&!o.match.ID.test(w[w.length-1])&&(n=m.find(w.shift(),d,v),d=n.expr?m.filter(n.expr,n.set)[0]:n.set[0]);if(d){n=f?{expr:w.pop(),set:s(f)}:m.find(w.pop(),w.length===1&&(w[0]==="~"||w[0]==="+")&&d.parentNode?d.parentNode:d,v),j=n.expr?m.filter(n.expr,n.set):n.set,w.length>0?k=s(j):u=!1;while(w.length)q=w.pop(),r=q,o.relative[q]?r=w.pop():q="",r==null&&(r=d),o.relative[q](k,r,v)}else k=w=[]}k||(k=j),k||m.error(q||b);if(g.call(k)==="[object Array]")if(!u)e.push.apply(e,k);else if(d&&d.nodeType===1)for(t=0;k[t]!=null;t++)k[t]&&(k[t]===!0||k[t].nodeType===1&&m.contains(d,k[t]))&&e.push(j[t]);else for(t=0;k[t]!=null;t++)k[t]&&k[t].nodeType===1&&e.push(j[t]);else s(k,e);l&&(m(l,h,e,f),m.uniqueSort(e));return e};m.uniqueSort=function(a){if(u){h=i,a.sort(u);if(h)for(var b=1;b0},m.find=function(a,b,c){var d,e,f,g,h,i;if(!a)return[];for(e=0,f=o.order.length;e":function(a,b){var c,d=typeof b=="string",e=0,f=a.length;if(d&&!l.test(b)){b=b.toLowerCase();for(;e=0)?c||d.push(h):c&&(b[g]=!1));return!1},ID:function(a){return a[1].replace(j,"")},TAG:function(a,b){return a[1].replace(j,"").toLowerCase()},CHILD:function(a){if(a[1]==="nth"){a[2]||m.error(a[0]),a[2]=a[2].replace(/^\+|\s*/g,"");var b=/(-?)(\d*)(?:n([+\-]?\d*))?/.exec(a[2]==="even"&&"2n"||a[2]==="odd"&&"2n+1"||!/\D/.test(a[2])&&"0n+"+a[2]||a[2]);a[2]=b[1]+(b[2]||1)-0,a[3]=b[3]-0}else a[2]&&m.error(a[0]);a[0]=e++;return a},ATTR:function(a,b,c,d,e,f){var g=a[1]=a[1].replace(j,"");!f&&o.attrMap[g]&&(a[1]=o.attrMap[g]),a[4]=(a[4]||a[5]||"").replace(j,""),a[2]==="~="&&(a[4]=" "+a[4]+" ");return a},PSEUDO:function(b,c,d,e,f){if(b[1]==="not")if((a.exec(b[3])||"").length>1||/^\w/.test(b[3]))b[3]=m(b[3],null,null,c);else{var g=m.filter(b[3],c,d,!0^f);d||e.push.apply(e,g);return!1}else if(o.match.POS.test(b[0])||o.match.CHILD.test(b[0]))return!0;return b},POS:function(a){a.unshift(!0);return a}},filters:{enabled:function(a){return a.disabled===!1&&a.type!=="hidden"},disabled:function(a){return a.disabled===!0},checked:function(a){return a.checked===!0},selected:function(a){a.parentNode&&a.parentNode.selectedIndex;return a.selected===!0},parent:function(a){return!!a.firstChild},empty:function(a){return!a.firstChild},has:function(a,b,c){return!!m(c[3],a).length},header:function(a){return/h\d/i.test(a.nodeName)},text:function(a){var b=a.getAttribute("type"),c=a.type;return a.nodeName.toLowerCase()==="input"&&"text"===c&&(b===c||b===null)},radio:function(a){return a.nodeName.toLowerCase()==="input"&&"radio"===a.type},checkbox:function(a){return a.nodeName.toLowerCase()==="input"&&"checkbox"===a.type},file:function(a){return a.nodeName.toLowerCase()==="input"&&"file"===a.type},password:function(a){return a.nodeName.toLowerCase()==="input"&&"password"===a.type},submit:function(a){var b=a.nodeName.toLowerCase();return(b==="input"||b==="button")&&"submit"===a.type},image:function(a){return a.nodeName.toLowerCase()==="input"&&"image"===a.type},reset:function(a){var b=a.nodeName.toLowerCase();return(b==="input"||b==="button")&&"reset"===a.type},button:function(a){var b=a.nodeName.toLowerCase();return b==="input"&&"button"===a.type||b==="button"},input:function(a){return/input|select|textarea|button/i.test(a.nodeName)},focus:function(a){return a===a.ownerDocument.activeElement}},setFilters:{first:function(a,b){return b===0},last:function(a,b,c,d){return b===d.length-1},even:function(a,b){return b%2===0},odd:function(a,b){return b%2===1},lt:function(a,b,c){return bc[3]-0},nth:function(a,b,c){return c[3]-0===b},eq:function(a,b,c){return c[3]-0===b}},filter:{PSEUDO:function(a,b,c,d){var e=b[1],f=o.filters[e];if(f)return f(a,c,b,d);if(e==="contains")return(a.textContent||a.innerText||n([a])||"").indexOf(b[3])>=0;if(e==="not"){var g=b[3];for(var h=0,i=g.length;h=0}},ID:function(a,b){return a.nodeType===1&&a.getAttribute("id")===b},TAG:function(a,b){return b==="*"&&a.nodeType===1||!!a.nodeName&&a.nodeName.toLowerCase()===b},CLASS:function(a,b){return(" "+(a.className||a.getAttribute("class"))+" ").indexOf(b)>-1},ATTR:function(a,b){var c=b[1],d=m.attr?m.attr(a,c):o.attrHandle[c]?o.attrHandle[c](a):a[c]!=null?a[c]:a.getAttribute(c),e=d+"",f=b[2],g=b[4];return d==null?f==="!=":!f&&m.attr?d!=null:f==="="?e===g:f==="*="?e.indexOf(g)>=0:f==="~="?(" "+e+" ").indexOf(g)>=0:g?f==="!="?e!==g:f==="^="?e.indexOf(g)===0:f==="$="?e.substr(e.length-g.length)===g:f==="|="?e===g||e.substr(0,g.length+1)===g+"-":!1:e&&d!==!1},POS:function(a,b,c,d){var e=b[2],f=o.setFilters[e];if(f)return f(a,c,b,d)}}},p=o.match.POS,q=function(a,b){return"\\"+(b-0+1)};for(var r in o.match)o.match[r]=new RegExp(o.match[r].source+/(?![^\[]*\])(?![^\(]*\))/.source),o.leftMatch[r]=new RegExp(/(^(?:.|\r|\n)*?)/.source+o.match[r].source.replace(/\\(\d+)/g,q));o.match.globalPOS=p;var s=function(a,b){a=Array.prototype.slice.call(a,0);if(b){b.push.apply(b,a);return b}return a};try{Array.prototype.slice.call(c.documentElement.childNodes,0)[0].nodeType}catch(t){s=function(a,b){var c=0,d=b||[];if(g.call(a)==="[object Array]")Array.prototype.push.apply(d,a);else if(typeof a.length=="number")for(var e=a.length;c",e.insertBefore(a,e.firstChild),c.getElementById(d)&&(o.find.ID=function(a,c,d){if(typeof c.getElementById!="undefined"&&!d){var e=c.getElementById(a[1]);return e?e.id===a[1]||typeof e.getAttributeNode!="undefined"&&e.getAttributeNode("id").nodeValue===a[1]?[e]:b:[]}},o.filter.ID=function(a,b){var c=typeof a.getAttributeNode!="undefined"&&a.getAttributeNode("id");return a.nodeType===1&&c&&c.nodeValue===b}),e.removeChild(a),e=a=null}(),function(){var a=c.createElement("div");a.appendChild(c.createComment("")),a.getElementsByTagName("*").length>0&&(o.find.TAG=function(a,b){var c=b.getElementsByTagName(a[1]);if(a[1]==="*"){var d=[];for(var e=0;c[e];e++)c[e].nodeType===1&&d.push(c[e]);c=d}return c}),a.innerHTML="",a.firstChild&&typeof a.firstChild.getAttribute!="undefined"&&a.firstChild.getAttribute("href")!=="#"&&(o.attrHandle.href=function(a){return a.getAttribute("href",2)}),a=null}(),c.querySelectorAll&&function(){var a=m,b=c.createElement("div"),d="__sizzle__";b.innerHTML="

";if(!b.querySelectorAll||b.querySelectorAll(".TEST").length!==0){m=function(b,e,f,g){e=e||c;if(!g&&!m.isXML(e)){var h=/^(\w+$)|^\.([\w\-]+$)|^#([\w\-]+$)/.exec(b);if(h&&(e.nodeType===1||e.nodeType===9)){if(h[1])return s(e.getElementsByTagName(b),f);if(h[2]&&o.find.CLASS&&e.getElementsByClassName)return s(e.getElementsByClassName(h[2]),f)}if(e.nodeType===9){if(b==="body"&&e.body)return s([e.body],f);if(h&&h[3]){var i=e.getElementById(h[3]);if(!i||!i.parentNode)return s([],f);if(i.id===h[3])return s([i],f)}try{return s(e.querySelectorAll(b),f)}catch(j){}}else if(e.nodeType===1&&e.nodeName.toLowerCase()!=="object"){var k=e,l=e.getAttribute("id"),n=l||d,p=e.parentNode,q=/^\s*[+~]/.test(b);l?n=n.replace(/'/g,"\\$&"):e.setAttribute("id",n),q&&p&&(e=e.parentNode);try{if(!q||p)return s(e.querySelectorAll("[id='"+n+"'] "+b),f)}catch(r){}finally{l||k.removeAttribute("id")}}}return a(b,e,f,g)};for(var e in a)m[e]=a[e];b=null}}(),function(){var a=c.documentElement,b=a.matchesSelector||a.mozMatchesSelector||a.webkitMatchesSelector||a.msMatchesSelector;if(b){var d=!b.call(c.createElement("div"),"div"),e=!1;try{b.call(c.documentElement,"[test!='']:sizzle")}catch(f){e=!0}m.matchesSelector=function(a,c){c=c.replace(/\=\s*([^'"\]]*)\s*\]/g,"='$1']");if(!m.isXML(a))try{if(e||!o.match.PSEUDO.test(c)&&!/!=/.test(c)){var f=b.call(a,c);if(f||!d||a.document&&a.document.nodeType!==11)return f}}catch(g){}return m(c,null,null,[a]).length>0}}}(),function(){var a=c.createElement("div");a.innerHTML="
";if(!!a.getElementsByClassName&&a.getElementsByClassName("e").length!==0){a.lastChild.className="e";if(a.getElementsByClassName("e").length===1)return;o.order.splice(1,0,"CLASS"),o.find.CLASS=function(a,b,c){if(typeof b.getElementsByClassName!="undefined"&&!c)return b.getElementsByClassName(a[1])},a=null}}(),c.documentElement.contains?m.contains=function(a,b){return a!==b&&(a.contains?a.contains(b):!0)}:c.documentElement.compareDocumentPosition?m.contains=function(a,b){return!!(a.compareDocumentPosition(b)&16)}:m.contains=function(){return!1},m.isXML=function(a){var b=(a?a.ownerDocument||a:0).documentElement;return b?b.nodeName!=="HTML":!1};var y=function(a,b,c){var d,e=[],f="",g=b.nodeType?[b]:b;while(d=o.match.PSEUDO.exec(a))f+=d[0],a=a.replace(o.match.PSEUDO,"");a=o.relative[a]?a+"*":a;for(var h=0,i=g.length;h0)for(h=g;h=0:f.filter(a,this).length>0:this.filter(a).length>0)},closest:function(a,b){var c=[],d,e,g=this[0];if(f.isArray(a)){var h=1;while(g&&g.ownerDocument&&g!==b){for(d=0;d-1:f.find.matchesSelector(g,a)){c.push(g);break}g=g.parentNode;if(!g||!g.ownerDocument||g===b||g.nodeType===11)break}}c=c.length>1?f.unique(c):c;return this.pushStack(c,"closest",a)},index:function(a){if(!a)return this[0]&&this[0].parentNode?this.prevAll().length:-1;if(typeof a=="string")return f.inArray(this[0],f(a));return f.inArray(a.jquery?a[0]:a,this)},add:function(a,b){var c=typeof a=="string"?f(a,b):f.makeArray(a&&a.nodeType?[a]:a),d=f.merge(this.get(),c);return this.pushStack(S(c[0])||S(d[0])?d:f.unique(d))},andSelf:function(){return this.add(this.prevObject)}}),f.each({parent:function(a){var b=a.parentNode;return b&&b.nodeType!==11?b:null},parents:function(a){return f.dir(a,"parentNode")},parentsUntil:function(a,b,c){return f.dir(a,"parentNode",c)},next:function(a){return f.nth(a,2,"nextSibling")},prev:function(a){return f.nth(a,2,"previousSibling")},nextAll:function(a){return f.dir(a,"nextSibling")},prevAll:function(a){return f.dir(a,"previousSibling")},nextUntil:function(a,b,c){return f.dir(a,"nextSibling",c)},prevUntil:function(a,b,c){return f.dir(a,"previousSibling",c)},siblings:function(a){return f.sibling((a.parentNode||{}).firstChild,a)},children:function(a){return f.sibling(a.firstChild)},contents:function(a){return f.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:f.makeArray(a.childNodes)}},function(a,b){f.fn[a]=function(c,d){var e=f.map(this,b,c);L.test(a)||(d=c),d&&typeof d=="string"&&(e=f.filter(d,e)),e=this.length>1&&!R[a]?f.unique(e):e,(this.length>1||N.test(d))&&M.test(a)&&(e=e.reverse());return this.pushStack(e,a,P.call(arguments).join(","))}}),f.extend({filter:function(a,b,c){c&&(a=":not("+a+")");return b.length===1?f.find.matchesSelector(b[0],a)?[b[0]]:[]:f.find.matches(a,b)},dir:function(a,c,d){var e=[],g=a[c];while(g&&g.nodeType!==9&&(d===b||g.nodeType!==1||!f(g).is(d)))g.nodeType===1&&e.push(g),g=g[c];return e},nth:function(a,b,c,d){b=b||1;var e=0;for(;a;a=a[c])if(a.nodeType===1&&++e===b)break;return a},sibling:function(a,b){var c=[];for(;a;a=a.nextSibling)a.nodeType===1&&a!==b&&c.push(a);return c}});var V="abbr|article|aside|audio|bdi|canvas|data|datalist|details|figcaption|figure|footer|header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",W=/ jQuery\d+="(?:\d+|null)"/g,X=/^\s+/,Y=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/ig,Z=/<([\w:]+)/,$=/]","i"),bd=/checked\s*(?:[^=]|=\s*.checked.)/i,be=/\/(java|ecma)script/i,bf=/^\s*",""],legend:[1,"
","
"],thead:[1,"","
"],tr:[2,"","
"],td:[3,"","
"],col:[2,"","
"],area:[1,"",""],_default:[0,"",""]},bh=U(c);bg.optgroup=bg.option,bg.tbody=bg.tfoot=bg.colgroup=bg.caption=bg.thead,bg.th=bg.td,f.support.htmlSerialize||(bg._default=[1,"div
","
"]),f.fn.extend({text:function(a){return f.access(this,function(a){return a===b?f.text(this):this.empty().append((this[0]&&this[0].ownerDocument||c).createTextNode(a))},null,a,arguments.length)},wrapAll:function(a){if(f.isFunction(a))return this.each(function(b){f(this).wrapAll(a.call(this,b))});if(this[0]){var b=f(a,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstChild&&a.firstChild.nodeType===1)a=a.firstChild;return a}).append(this)}return this},wrapInner:function(a){if(f.isFunction(a))return this.each(function(b){f(this).wrapInner(a.call(this,b))});return this.each(function(){var b=f(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){var b=f.isFunction(a);return this.each(function(c){f(this).wrapAll(b?a.call(this,c):a)})},unwrap:function(){return this.parent().each(function(){f.nodeName(this,"body")||f(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.appendChild(a)})},prepend:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.insertBefore(a,this.firstChild)})},before:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this)});if(arguments.length){var a=f +.clean(arguments);a.push.apply(a,this.toArray());return this.pushStack(a,"before",arguments)}},after:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this.nextSibling)});if(arguments.length){var a=this.pushStack(this,"after",arguments);a.push.apply(a,f.clean(arguments));return a}},remove:function(a,b){for(var c=0,d;(d=this[c])!=null;c++)if(!a||f.filter(a,[d]).length)!b&&d.nodeType===1&&(f.cleanData(d.getElementsByTagName("*")),f.cleanData([d])),d.parentNode&&d.parentNode.removeChild(d);return this},empty:function(){for(var a=0,b;(b=this[a])!=null;a++){b.nodeType===1&&f.cleanData(b.getElementsByTagName("*"));while(b.firstChild)b.removeChild(b.firstChild)}return this},clone:function(a,b){a=a==null?!1:a,b=b==null?a:b;return this.map(function(){return f.clone(this,a,b)})},html:function(a){return f.access(this,function(a){var c=this[0]||{},d=0,e=this.length;if(a===b)return c.nodeType===1?c.innerHTML.replace(W,""):null;if(typeof a=="string"&&!ba.test(a)&&(f.support.leadingWhitespace||!X.test(a))&&!bg[(Z.exec(a)||["",""])[1].toLowerCase()]){a=a.replace(Y,"<$1>");try{for(;d1&&l0?this.clone(!0):this).get();f(e[h])[b](j),d=d.concat(j)}return this.pushStack(d,a,e.selector)}}),f.extend({clone:function(a,b,c){var d,e,g,h=f.support.html5Clone||f.isXMLDoc(a)||!bc.test("<"+a.nodeName+">")?a.cloneNode(!0):bo(a);if((!f.support.noCloneEvent||!f.support.noCloneChecked)&&(a.nodeType===1||a.nodeType===11)&&!f.isXMLDoc(a)){bk(a,h),d=bl(a),e=bl(h);for(g=0;d[g];++g)e[g]&&bk(d[g],e[g])}if(b){bj(a,h);if(c){d=bl(a),e=bl(h);for(g=0;d[g];++g)bj(d[g],e[g])}}d=e=null;return h},clean:function(a,b,d,e){var g,h,i,j=[];b=b||c,typeof b.createElement=="undefined"&&(b=b.ownerDocument||b[0]&&b[0].ownerDocument||c);for(var k=0,l;(l=a[k])!=null;k++){typeof l=="number"&&(l+="");if(!l)continue;if(typeof l=="string")if(!_.test(l))l=b.createTextNode(l);else{l=l.replace(Y,"<$1>");var m=(Z.exec(l)||["",""])[1].toLowerCase(),n=bg[m]||bg._default,o=n[0],p=b.createElement("div"),q=bh.childNodes,r;b===c?bh.appendChild(p):U(b).appendChild(p),p.innerHTML=n[1]+l+n[2];while(o--)p=p.lastChild;if(!f.support.tbody){var s=$.test(l),t=m==="table"&&!s?p.firstChild&&p.firstChild.childNodes:n[1]===""&&!s?p.childNodes:[];for(i=t.length-1;i>=0;--i)f.nodeName(t[i],"tbody")&&!t[i].childNodes.length&&t[i].parentNode.removeChild(t[i])}!f.support.leadingWhitespace&&X.test(l)&&p.insertBefore(b.createTextNode(X.exec(l)[0]),p.firstChild),l=p.childNodes,p&&(p.parentNode.removeChild(p),q.length>0&&(r=q[q.length-1],r&&r.parentNode&&r.parentNode.removeChild(r)))}var u;if(!f.support.appendChecked)if(l[0]&&typeof (u=l.length)=="number")for(i=0;i1)},f.extend({cssHooks:{opacity:{get:function(a,b){if(b){var c=by(a,"opacity");return c===""?"1":c}return a.style.opacity}}},cssNumber:{fillOpacity:!0,fontWeight:!0,lineHeight:!0,opacity:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":f.support.cssFloat?"cssFloat":"styleFloat"},style:function(a,c,d,e){if(!!a&&a.nodeType!==3&&a.nodeType!==8&&!!a.style){var g,h,i=f.camelCase(c),j=a.style,k=f.cssHooks[i];c=f.cssProps[i]||i;if(d===b){if(k&&"get"in k&&(g=k.get(a,!1,e))!==b)return g;return j[c]}h=typeof d,h==="string"&&(g=bu.exec(d))&&(d=+(g[1]+1)*+g[2]+parseFloat(f.css(a,c)),h="number");if(d==null||h==="number"&&isNaN(d))return;h==="number"&&!f.cssNumber[i]&&(d+="px");if(!k||!("set"in k)||(d=k.set(a,d))!==b)try{j[c]=d}catch(l){}}},css:function(a,c,d){var e,g;c=f.camelCase(c),g=f.cssHooks[c],c=f.cssProps[c]||c,c==="cssFloat"&&(c="float");if(g&&"get"in g&&(e=g.get(a,!0,d))!==b)return e;if(by)return by(a,c)},swap:function(a,b,c){var d={},e,f;for(f in b)d[f]=a.style[f],a.style[f]=b[f];e=c.call(a);for(f in b)a.style[f]=d[f];return e}}),f.curCSS=f.css,c.defaultView&&c.defaultView.getComputedStyle&&(bz=function(a,b){var c,d,e,g,h=a.style;b=b.replace(br,"-$1").toLowerCase(),(d=a.ownerDocument.defaultView)&&(e=d.getComputedStyle(a,null))&&(c=e.getPropertyValue(b),c===""&&!f.contains(a.ownerDocument.documentElement,a)&&(c=f.style(a,b))),!f.support.pixelMargin&&e&&bv.test(b)&&bt.test(c)&&(g=h.width,h.width=c,c=e.width,h.width=g);return c}),c.documentElement.currentStyle&&(bA=function(a,b){var c,d,e,f=a.currentStyle&&a.currentStyle[b],g=a.style;f==null&&g&&(e=g[b])&&(f=e),bt.test(f)&&(c=g.left,d=a.runtimeStyle&&a.runtimeStyle.left,d&&(a.runtimeStyle.left=a.currentStyle.left),g.left=b==="fontSize"?"1em":f,f=g.pixelLeft+"px",g.left=c,d&&(a.runtimeStyle.left=d));return f===""?"auto":f}),by=bz||bA,f.each(["height","width"],function(a,b){f.cssHooks[b]={get:function(a,c,d){if(c)return a.offsetWidth!==0?bB(a,b,d):f.swap(a,bw,function(){return bB(a,b,d)})},set:function(a,b){return bs.test(b)?b+"px":b}}}),f.support.opacity||(f.cssHooks.opacity={get:function(a,b){return bq.test((b&&a.currentStyle?a.currentStyle.filter:a.style.filter)||"")?parseFloat(RegExp.$1)/100+"":b?"1":""},set:function(a,b){var c=a.style,d=a.currentStyle,e=f.isNumeric(b)?"alpha(opacity="+b*100+")":"",g=d&&d.filter||c.filter||"";c.zoom=1;if(b>=1&&f.trim(g.replace(bp,""))===""){c.removeAttribute("filter");if(d&&!d.filter)return}c.filter=bp.test(g)?g.replace(bp,e):g+" "+e}}),f(function(){f.support.reliableMarginRight||(f.cssHooks.marginRight={get:function(a,b){return f.swap(a,{display:"inline-block"},function(){return b?by(a,"margin-right"):a.style.marginRight})}})}),f.expr&&f.expr.filters&&(f.expr.filters.hidden=function(a){var b=a.offsetWidth,c=a.offsetHeight;return b===0&&c===0||!f.support.reliableHiddenOffsets&&(a.style&&a.style.display||f.css(a,"display"))==="none"},f.expr.filters.visible=function(a){return!f.expr.filters.hidden(a)}),f.each({margin:"",padding:"",border:"Width"},function(a,b){f.cssHooks[a+b]={expand:function(c){var d,e=typeof c=="string"?c.split(" "):[c],f={};for(d=0;d<4;d++)f[a+bx[d]+b]=e[d]||e[d-2]||e[0];return f}}});var bC=/%20/g,bD=/\[\]$/,bE=/\r?\n/g,bF=/#.*$/,bG=/^(.*?):[ \t]*([^\r\n]*)\r?$/mg,bH=/^(?:color|date|datetime|datetime-local|email|hidden|month|number|password|range|search|tel|text|time|url|week)$/i,bI=/^(?:about|app|app\-storage|.+\-extension|file|res|widget):$/,bJ=/^(?:GET|HEAD)$/,bK=/^\/\//,bL=/\?/,bM=/)<[^<]*)*<\/script>/gi,bN=/^(?:select|textarea)/i,bO=/\s+/,bP=/([?&])_=[^&]*/,bQ=/^([\w\+\.\-]+:)(?:\/\/([^\/?#:]*)(?::(\d+))?)?/,bR=f.fn.load,bS={},bT={},bU,bV,bW=["*/"]+["*"];try{bU=e.href}catch(bX){bU=c.createElement("a"),bU.href="",bU=bU.href}bV=bQ.exec(bU.toLowerCase())||[],f.fn.extend({load:function(a,c,d){if(typeof a!="string"&&bR)return bR.apply(this,arguments);if(!this.length)return this;var e=a.indexOf(" ");if(e>=0){var g=a.slice(e,a.length);a=a.slice(0,e)}var h="GET";c&&(f.isFunction(c)?(d=c,c=b):typeof c=="object"&&(c=f.param(c,f.ajaxSettings.traditional),h="POST"));var i=this;f.ajax({url:a,type:h,dataType:"html",data:c,complete:function(a,b,c){c=a.responseText,a.isResolved()&&(a.done(function(a){c=a}),i.html(g?f("
").append(c.replace(bM,"")).find(g):c)),d&&i.each(d,[c,b,a])}});return this},serialize:function(){return f.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?f.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||bN.test(this.nodeName)||bH.test(this.type))}).map(function(a,b){var c=f(this).val();return c==null?null:f.isArray(c)?f.map(c,function(a,c){return{name:b.name,value:a.replace(bE,"\r\n")}}):{name:b.name,value:c.replace(bE,"\r\n")}}).get()}}),f.each("ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "),function(a,b){f.fn[b]=function(a){return this.on(b,a)}}),f.each(["get","post"],function(a,c){f[c]=function(a,d,e,g){f.isFunction(d)&&(g=g||e,e=d,d=b);return f.ajax({type:c,url:a,data:d,success:e,dataType:g})}}),f.extend({getScript:function(a,c){return f.get(a,b,c,"script")},getJSON:function(a,b,c){return f.get(a,b,c,"json")},ajaxSetup:function(a,b){b?b$(a,f.ajaxSettings):(b=a,a=f.ajaxSettings),b$(a,b);return a},ajaxSettings:{url:bU,isLocal:bI.test(bV[1]),global:!0,type:"GET",contentType:"application/x-www-form-urlencoded; charset=UTF-8",processData:!0,async:!0,accepts:{xml:"application/xml, text/xml",html:"text/html",text:"text/plain",json:"application/json, text/javascript","*":bW},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText"},converters:{"* text":a.String,"text html":!0,"text json":f.parseJSON,"text xml":f.parseXML},flatOptions:{context:!0,url:!0}},ajaxPrefilter:bY(bS),ajaxTransport:bY(bT),ajax:function(a,c){function w(a,c,l,m){if(s!==2){s=2,q&&clearTimeout(q),p=b,n=m||"",v.readyState=a>0?4:0;var o,r,u,w=c,x=l?ca(d,v,l):b,y,z;if(a>=200&&a<300||a===304){if(d.ifModified){if(y=v.getResponseHeader("Last-Modified"))f.lastModified[k]=y;if(z=v.getResponseHeader("Etag"))f.etag[k]=z}if(a===304)w="notmodified",o=!0;else try{r=cb(d,x),w="success",o=!0}catch(A){w="parsererror",u=A}}else{u=w;if(!w||a)w="error",a<0&&(a=0)}v.status=a,v.statusText=""+(c||w),o?h.resolveWith(e,[r,w,v]):h.rejectWith(e,[v,w,u]),v.statusCode(j),j=b,t&&g.trigger("ajax"+(o?"Success":"Error"),[v,d,o?r:u]),i.fireWith(e,[v,w]),t&&(g.trigger("ajaxComplete",[v,d]),--f.active||f.event.trigger("ajaxStop"))}}typeof a=="object"&&(c=a,a=b),c=c||{};var d=f.ajaxSetup({},c),e=d.context||d,g=e!==d&&(e.nodeType||e instanceof f)?f(e):f.event,h=f.Deferred(),i=f.Callbacks("once memory"),j=d.statusCode||{},k,l={},m={},n,o,p,q,r,s=0,t,u,v={readyState:0,setRequestHeader:function(a,b){if(!s){var c=a.toLowerCase();a=m[c]=m[c]||a,l[a]=b}return this},getAllResponseHeaders:function(){return s===2?n:null},getResponseHeader:function(a){var c;if(s===2){if(!o){o={};while(c=bG.exec(n))o[c[1].toLowerCase()]=c[2]}c=o[a.toLowerCase()]}return c===b?null:c},overrideMimeType:function(a){s||(d.mimeType=a);return this},abort:function(a){a=a||"abort",p&&p.abort(a),w(0,a);return this}};h.promise(v),v.success=v.done,v.error=v.fail,v.complete=i.add,v.statusCode=function(a){if(a){var b;if(s<2)for(b in a)j[b]=[j[b],a[b]];else b=a[v.status],v.then(b,b)}return this},d.url=((a||d.url)+"").replace(bF,"").replace(bK,bV[1]+"//"),d.dataTypes=f.trim(d.dataType||"*").toLowerCase().split(bO),d.crossDomain==null&&(r=bQ.exec(d.url.toLowerCase()),d.crossDomain=!(!r||r[1]==bV[1]&&r[2]==bV[2]&&(r[3]||(r[1]==="http:"?80:443))==(bV[3]||(bV[1]==="http:"?80:443)))),d.data&&d.processData&&typeof d.data!="string"&&(d.data=f.param(d.data,d.traditional)),bZ(bS,d,c,v);if(s===2)return!1;t=d.global,d.type=d.type.toUpperCase(),d.hasContent=!bJ.test(d.type),t&&f.active++===0&&f.event.trigger("ajaxStart");if(!d.hasContent){d.data&&(d.url+=(bL.test(d.url)?"&":"?")+d.data,delete d.data),k=d.url;if(d.cache===!1){var x=f.now(),y=d.url.replace(bP,"$1_="+x);d.url=y+(y===d.url?(bL.test(d.url)?"&":"?")+"_="+x:"")}}(d.data&&d.hasContent&&d.contentType!==!1||c.contentType)&&v.setRequestHeader("Content-Type",d.contentType),d.ifModified&&(k=k||d.url,f.lastModified[k]&&v.setRequestHeader("If-Modified-Since",f.lastModified[k]),f.etag[k]&&v.setRequestHeader("If-None-Match",f.etag[k])),v.setRequestHeader("Accept",d.dataTypes[0]&&d.accepts[d.dataTypes[0]]?d.accepts[d.dataTypes[0]]+(d.dataTypes[0]!=="*"?", "+bW+"; q=0.01":""):d.accepts["*"]);for(u in d.headers)v.setRequestHeader(u,d.headers[u]);if(d.beforeSend&&(d.beforeSend.call(e,v,d)===!1||s===2)){v.abort();return!1}for(u in{success:1,error:1,complete:1})v[u](d[u]);p=bZ(bT,d,c,v);if(!p)w(-1,"No Transport");else{v.readyState=1,t&&g.trigger("ajaxSend",[v,d]),d.async&&d.timeout>0&&(q=setTimeout(function(){v.abort("timeout")},d.timeout));try{s=1,p.send(l,w)}catch(z){if(s<2)w(-1,z);else throw z}}return v},param:function(a,c){var d=[],e=function(a,b){b=f.isFunction(b)?b():b,d[d.length]=encodeURIComponent(a)+"="+encodeURIComponent(b)};c===b&&(c=f.ajaxSettings.traditional);if(f.isArray(a)||a.jquery&&!f.isPlainObject(a))f.each(a,function(){e(this.name,this.value)});else for(var g in a)b_(g,a[g],c,e);return d.join("&").replace(bC,"+")}}),f.extend({active:0,lastModified:{},etag:{}});var cc=f.now(),cd=/(\=)\?(&|$)|\?\?/i;f.ajaxSetup({jsonp:"callback",jsonpCallback:function(){return f.expando+"_"+cc++}}),f.ajaxPrefilter("json jsonp",function(b,c,d){var e=typeof b.data=="string"&&/^application\/x\-www\-form\-urlencoded/.test(b.contentType);if(b.dataTypes[0]==="jsonp"||b.jsonp!==!1&&(cd.test(b.url)||e&&cd.test(b.data))){var g,h=b.jsonpCallback=f.isFunction(b.jsonpCallback)?b.jsonpCallback():b.jsonpCallback,i=a[h],j=b.url,k=b.data,l="$1"+h+"$2";b.jsonp!==!1&&(j=j.replace(cd,l),b.url===j&&(e&&(k=k.replace(cd,l)),b.data===k&&(j+=(/\?/.test(j)?"&":"?")+b.jsonp+"="+h))),b.url=j,b.data=k,a[h]=function(a){g=[a]},d.always(function(){a[h]=i,g&&f.isFunction(i)&&a[h](g[0])}),b.converters["script json"]=function(){g||f.error(h+" was not called");return g[0]},b.dataTypes[0]="json";return"script"}}),f.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/javascript|ecmascript/},converters:{"text script":function(a){f.globalEval(a);return a}}}),f.ajaxPrefilter("script",function(a){a.cache===b&&(a.cache=!1),a.crossDomain&&(a.type="GET",a.global=!1)}),f.ajaxTransport("script",function(a){if(a.crossDomain){var d,e=c.head||c.getElementsByTagName("head")[0]||c.documentElement;return{send:function(f,g){d=c.createElement("script"),d.async="async",a.scriptCharset&&(d.charset=a.scriptCharset),d.src=a.url,d.onload=d.onreadystatechange=function(a,c){if(c||!d.readyState||/loaded|complete/.test(d.readyState))d.onload=d.onreadystatechange=null,e&&d.parentNode&&e.removeChild(d),d=b,c||g(200,"success")},e.insertBefore(d,e.firstChild)},abort:function(){d&&d.onload(0,1)}}}});var ce=a.ActiveXObject?function(){for(var a in cg)cg[a](0,1)}:!1,cf=0,cg;f.ajaxSettings.xhr=a.ActiveXObject?function(){return!this.isLocal&&ch()||ci()}:ch,function(a){f.extend(f.support,{ajax:!!a,cors:!!a&&"withCredentials"in a})}(f.ajaxSettings.xhr()),f.support.ajax&&f.ajaxTransport(function(c){if(!c.crossDomain||f.support.cors){var d;return{send:function(e,g){var h=c.xhr(),i,j;c.username?h.open(c.type,c.url,c.async,c.username,c.password):h.open(c.type,c.url,c.async);if(c.xhrFields)for(j in c.xhrFields)h[j]=c.xhrFields[j];c.mimeType&&h.overrideMimeType&&h.overrideMimeType(c.mimeType),!c.crossDomain&&!e["X-Requested-With"]&&(e["X-Requested-With"]="XMLHttpRequest");try{for(j in e)h.setRequestHeader(j,e[j])}catch(k){}h.send(c.hasContent&&c.data||null),d=function(a,e){var j,k,l,m,n;try{if(d&&(e||h.readyState===4)){d=b,i&&(h.onreadystatechange=f.noop,ce&&delete cg[i]);if(e)h.readyState!==4&&h.abort();else{j=h.status,l=h.getAllResponseHeaders(),m={},n=h.responseXML,n&&n.documentElement&&(m.xml=n);try{m.text=h.responseText}catch(a){}try{k=h.statusText}catch(o){k=""}!j&&c.isLocal&&!c.crossDomain?j=m.text?200:404:j===1223&&(j=204)}}}catch(p){e||g(-1,p)}m&&g(j,k,m,l)},!c.async||h.readyState===4?d():(i=++cf,ce&&(cg||(cg={},f(a).unload(ce)),cg[i]=d),h.onreadystatechange=d)},abort:function(){d&&d(0,1)}}}});var cj={},ck,cl,cm=/^(?:toggle|show|hide)$/,cn=/^([+\-]=)?([\d+.\-]+)([a-z%]*)$/i,co,cp=[["height","marginTop","marginBottom","paddingTop","paddingBottom"],["width","marginLeft","marginRight","paddingLeft","paddingRight"],["opacity"]],cq;f.fn.extend({show:function(a,b,c){var d,e;if(a||a===0)return this.animate(ct("show",3),a,b,c);for(var g=0,h=this.length;g=i.duration+this.startTime){this.now=this.end,this.pos=this.state=1,this.update(),i.animatedProperties[this.prop]=!0;for(b in i.animatedProperties)i.animatedProperties[b]!==!0&&(g=!1);if(g){i.overflow!=null&&!f.support.shrinkWrapBlocks&&f.each(["","X","Y"],function(a,b){h.style["overflow"+b]=i.overflow[a]}),i.hide&&f(h).hide();if(i.hide||i.show)for(b in i.animatedProperties)f.style(h,b,i.orig[b]),f.removeData(h,"fxshow"+b,!0),f.removeData(h,"toggle"+b,!0);d=i.complete,d&&(i.complete=!1,d.call(h))}return!1}i.duration==Infinity?this.now=e:(c=e-this.startTime,this.state=c/i.duration,this.pos=f.easing[i.animatedProperties[this.prop]](this.state,c,0,1,i.duration),this.now=this.start+(this.end-this.start)*this.pos),this.update();return!0}},f.extend(f.fx,{tick:function(){var a,b=f.timers,c=0;for(;c-1,k={},l={},m,n;j?(l=e.position(),m=l.top,n=l.left):(m=parseFloat(h)||0,n=parseFloat(i)||0),f.isFunction(b)&&(b=b.call(a,c,g)),b.top!=null&&(k.top=b.top-g.top+m),b.left!=null&&(k.left=b.left-g.left+n),"using"in b?b.using.call(a,k):e.css(k)}},f.fn.extend({position:function(){if(!this[0])return null;var a=this[0],b=this.offsetParent(),c=this.offset(),d=cx.test(b[0].nodeName)?{top:0,left:0}:b.offset();c.top-=parseFloat(f.css(a,"marginTop"))||0,c.left-=parseFloat(f.css(a,"marginLeft"))||0,d.top+=parseFloat(f.css(b[0],"borderTopWidth"))||0,d.left+=parseFloat(f.css(b[0],"borderLeftWidth"))||0;return{top:c.top-d.top,left:c.left-d.left}},offsetParent:function(){return this.map(function(){var a=this.offsetParent||c.body;while(a&&!cx.test(a.nodeName)&&f.css(a,"position")==="static")a=a.offsetParent;return a})}}),f.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(a,c){var d=/Y/.test(c);f.fn[a]=function(e){return f.access(this,function(a,e,g){var h=cy(a);if(g===b)return h?c in h?h[c]:f.support.boxModel&&h.document.documentElement[e]||h.document.body[e]:a[e];h?h.scrollTo(d?f(h).scrollLeft():g,d?g:f(h).scrollTop()):a[e]=g},a,e,arguments.length,null)}}),f.each({Height:"height",Width:"width"},function(a,c){var d="client"+a,e="scroll"+a,g="offset"+a;f.fn["inner"+a]=function(){var a=this[0];return a?a.style?parseFloat(f.css(a,c,"padding")):this[c]():null},f.fn["outer"+a]=function(a){var b=this[0];return b?b.style?parseFloat(f.css(b,c,a?"margin":"border")):this[c]():null},f.fn[c]=function(a){return f.access(this,function(a,c,h){var i,j,k,l;if(f.isWindow(a)){i=a.document,j=i.documentElement[d];return f.support.boxModel&&j||i.body&&i.body[d]||j}if(a.nodeType===9){i=a.documentElement;if(i[d]>=i[e])return i[d];return Math.max(a.body[e],i[e],a.body[g],i[g])}if(h===b){k=f.css(a,c),l=parseFloat(k);return f.isNumeric(l)?l:k}f(a).css(c,h)},c,a,arguments.length,null)}}),a.jQuery=a.$=f,typeof define=="function"&&define.amd&&define.amd.jQuery&&define("jquery",[],function(){return f})})(window); \ No newline at end of file diff --git a/libraries/docs/website/src/main/apidocs/stylesheet.css b/libraries/docs/website/src/main/apidocs/stylesheet.css index 1ff34e71b72..3a5d400d256 100644 --- a/libraries/docs/website/src/main/apidocs/stylesheet.css +++ b/libraries/docs/website/src/main/apidocs/stylesheet.css @@ -117,3 +117,10 @@ th, table { border-collapse:collapse;border-color: #E6E7E8; } .NavBarCell2 { background-color:#FFFFFF;} .NavBarCell3 { background-color:#FFFFFF;} + +div.doc-member.function { + border-bottom: 1px solid #E6E7E8; +} +div.source-detail { + float:right; +} \ No newline at end of file diff --git a/libraries/kotlin-swing/ReadMe.md b/libraries/kotlin-swing/ReadMe.md index 35b6b5639d4..6fb1a0aa3c2 100644 --- a/libraries/kotlin-swing/ReadMe.md +++ b/libraries/kotlin-swing/ReadMe.md @@ -4,6 +4,7 @@ The Kotlin Swing library provides some helper functions and extensions for creat To try the sample run + cd kotlin/libraries/kotlin-swing mvn test -Pui Or browse the [source of the sample](https://github.com/JetBrains/kotlin/blob/master/libraries/kotlin-swing/src/test/kotlin/test/kotlin/swing/SwingSample.kt) diff --git a/libraries/sandbox/templatelib/src/TemplateHtml.kt b/libraries/sandbox/templatelib/src/TemplateHtml.kt index 9de7bd3e831..5d34c5cdf14 100644 --- a/libraries/sandbox/templatelib/src/TemplateHtml.kt +++ b/libraries/sandbox/templatelib/src/TemplateHtml.kt @@ -44,10 +44,8 @@ abstract class Tag(val name : String) : Element() { builder.append("<") builder.append(name) if (!attributes.isEmpty()) { - for (e in attributes.entrySet()) { - if (e != null) { - builder.append(" ${e.getKey()}=\"${e.getValue()}\"") - } + for (e in attributes) { + builder.append(" ${e.key}=\"${e.value}\"") } } if (children.isEmpty()) { diff --git a/libraries/stdlib/src/generated/ArraysFromJLangIterables.kt b/libraries/stdlib/src/generated/ArraysFromJLangIterables.kt index c4311339aee..c8d1fed1ab7 100644 --- a/libraries/stdlib/src/generated/ArraysFromJLangIterables.kt +++ b/libraries/stdlib/src/generated/ArraysFromJLangIterables.kt @@ -141,11 +141,18 @@ public inline fun Array.fold(initial: T, operation: (T, T) -> T): T { public inline fun Array.foldRight(initial: T, operation: (T, T) -> T): T = reverse().fold(initial, operation) /** - * Transforms each element using the result as the key in a map to group elements by the result + * Groups the elements in the collection into a new [[Map]] using the supplied *toKey* function to calculate the key to group the elements by * * @includeFunctionBody ../../test/CollectionTest.kt groupBy */ -public inline fun Array.groupBy(result: Map> = HashMap>(), toKey: (T) -> K) : Map> { +public inline fun Array.groupBy(toKey: (T) -> K) : Map> = groupByTo(HashMap>(), toKey) + +/** + * Groups the elements in the collection into the given [[Map]] using the supplied *toKey* function to calculate the key to group the elements by + * + * @includeFunctionBody ../../test/CollectionTest.kt groupBy + */ +public inline fun Array.groupByTo(result: Map>, toKey: (T) -> K) : Map> { for (element in this) { val key = toKey(element) val list = result.getOrPut(key) { ArrayList() } @@ -160,7 +167,7 @@ public inline fun Array.groupBy(result: Map> = HashMap Array.makeString(separator: String = ", ", prefix: String = "", postfix: String = "", limit: Int = -1, truncated: String = "..."): String { val buffer = StringBuilder() diff --git a/libraries/stdlib/src/generated/JUtilIteratorsFromJLangIterables.kt b/libraries/stdlib/src/generated/JUtilIteratorsFromJLangIterables.kt index be372c4cbd9..a5f246eb0cf 100644 --- a/libraries/stdlib/src/generated/JUtilIteratorsFromJLangIterables.kt +++ b/libraries/stdlib/src/generated/JUtilIteratorsFromJLangIterables.kt @@ -139,11 +139,18 @@ public inline fun java.util.Iterator.fold(initial: T, operation: (T, T) - public inline fun java.util.Iterator.foldRight(initial: T, operation: (T, T) -> T): T = reverse().fold(initial, operation) /** - * Transforms each element using the result as the key in a map to group elements by the result + * Groups the elements in the collection into a new [[Map]] using the supplied *toKey* function to calculate the key to group the elements by * * @includeFunctionBody ../../test/CollectionTest.kt groupBy */ -public inline fun java.util.Iterator.groupBy(result: Map> = HashMap>(), toKey: (T) -> K) : Map> { +public inline fun java.util.Iterator.groupBy(toKey: (T) -> K) : Map> = groupByTo(HashMap>(), toKey) + +/** + * Groups the elements in the collection into the given [[Map]] using the supplied *toKey* function to calculate the key to group the elements by + * + * @includeFunctionBody ../../test/CollectionTest.kt groupBy + */ +public inline fun java.util.Iterator.groupByTo(result: Map>, toKey: (T) -> K) : Map> { for (element in this) { val key = toKey(element) val list = result.getOrPut(key) { ArrayList() } @@ -158,7 +165,7 @@ public inline fun java.util.Iterator.groupBy(result: Map> = * If a collection could be huge you can specify a non-negative value of *limit* which will only show a subset of the collection then it will * a special *truncated* separator (which defaults to "..." * - * @includeFunctionBody ../../test/CollectionTest.kt appendString + * @includeFunctionBody ../../test/CollectionTest.kt makeString */ public inline fun java.util.Iterator.makeString(separator: String = ", ", prefix: String = "", postfix: String = "", limit: Int = -1, truncated: String = "..."): String { val buffer = StringBuilder() diff --git a/libraries/stdlib/src/generated/StandardFromJLangIterables.kt b/libraries/stdlib/src/generated/StandardFromJLangIterables.kt index a07ee5d7a3a..037ebe1ba58 100644 --- a/libraries/stdlib/src/generated/StandardFromJLangIterables.kt +++ b/libraries/stdlib/src/generated/StandardFromJLangIterables.kt @@ -141,11 +141,18 @@ public inline fun Iterable.fold(initial: T, operation: (T, T) -> T): T { public inline fun Iterable.foldRight(initial: T, operation: (T, T) -> T): T = reverse().fold(initial, operation) /** - * Transforms each element using the result as the key in a map to group elements by the result + * Groups the elements in the collection into a new [[Map]] using the supplied *toKey* function to calculate the key to group the elements by * * @includeFunctionBody ../../test/CollectionTest.kt groupBy */ -public inline fun Iterable.groupBy(result: Map> = HashMap>(), toKey: (T) -> K) : Map> { +public inline fun Iterable.groupBy(toKey: (T) -> K) : Map> = groupByTo(HashMap>(), toKey) + +/** + * Groups the elements in the collection into the given [[Map]] using the supplied *toKey* function to calculate the key to group the elements by + * + * @includeFunctionBody ../../test/CollectionTest.kt groupBy + */ +public inline fun Iterable.groupByTo(result: Map>, toKey: (T) -> K) : Map> { for (element in this) { val key = toKey(element) val list = result.getOrPut(key) { ArrayList() } @@ -160,7 +167,7 @@ public inline fun Iterable.groupBy(result: Map> = HashMap Iterable.makeString(separator: String = ", ", prefix: String = "", postfix: String = "", limit: Int = -1, truncated: String = "..."): String { val buffer = StringBuilder() diff --git a/libraries/stdlib/src/kotlin/JLangIterables.kt b/libraries/stdlib/src/kotlin/JLangIterables.kt index 061fafa1eb1..63a3400fbda 100644 --- a/libraries/stdlib/src/kotlin/JLangIterables.kt +++ b/libraries/stdlib/src/kotlin/JLangIterables.kt @@ -138,11 +138,18 @@ public inline fun java.lang.Iterable.fold(initial: T, operation: (T, T) - public inline fun java.lang.Iterable.foldRight(initial: T, operation: (T, T) -> T): T = reverse().fold(initial, operation) /** - * Transforms each element using the result as the key in a map to group elements by the result + * Groups the elements in the collection into a new [[Map]] using the supplied *toKey* function to calculate the key to group the elements by * * @includeFunctionBody ../../test/CollectionTest.kt groupBy */ -public inline fun java.lang.Iterable.groupBy(result: Map> = HashMap>(), toKey: (T) -> K) : Map> { +public inline fun java.lang.Iterable.groupBy(toKey: (T) -> K) : Map> = groupByTo(HashMap>(), toKey) + +/** + * Groups the elements in the collection into the given [[Map]] using the supplied *toKey* function to calculate the key to group the elements by + * + * @includeFunctionBody ../../test/CollectionTest.kt groupBy + */ +public inline fun java.lang.Iterable.groupByTo(result: Map>, toKey: (T) -> K) : Map> { for (element in this) { val key = toKey(element) val list = result.getOrPut(key) { ArrayList() } diff --git a/libraries/stdlib/src/kotlin/JUtilCollections.kt b/libraries/stdlib/src/kotlin/JUtilCollections.kt index 6d8114b8d22..72a49f3dca6 100644 --- a/libraries/stdlib/src/kotlin/JUtilCollections.kt +++ b/libraries/stdlib/src/kotlin/JUtilCollections.kt @@ -10,7 +10,7 @@ import java.util.* // /** - * Returns a new List containing the results of applying the given function to each element in this collection + * Returns a new List containing the results of applying the given *transform* function to each element in this collection * * @includeFunctionBody ../../test/CollectionTest.kt map */ @@ -18,7 +18,10 @@ public inline fun java.util.Collection.map(transform : (T) -> R) : jav return mapTo(java.util.ArrayList(this.size), transform) } -/** Transforms each element of this collection with the given function then adds the results to the given collection */ +/** + * Transforms each element of this collection with the given *transform* function and + * adds each return value to the given *results* collection + */ public inline fun > java.util.Collection.mapTo(result: C, transform : (T) -> R) : C { for (item in this) result.add(transform(item)) diff --git a/libraries/stdlib/src/kotlin/JUtilMaps.kt b/libraries/stdlib/src/kotlin/JUtilMaps.kt index da6b1f9da11..3117068869d 100644 --- a/libraries/stdlib/src/kotlin/JUtilMaps.kt +++ b/libraries/stdlib/src/kotlin/JUtilMaps.kt @@ -1,11 +1,11 @@ package kotlin import java.util.Map as JMap -import java.util.HashMap +import java.util.Map.Entry as JEntry +import java.util.Collection import java.util.Collections - -// Temporary workaround: commenting out -//import java.util.Map.Entry as JEntry +import java.util.HashMap +import java.util.List // Map APIs @@ -26,14 +26,12 @@ public inline fun java.util.Map?.orEmpty() : java.util.Map /** Returns the key of the entry */ -// Temporary workaround: commenting out -//val JEntry.key : K -// get() = getKey().sure() +val JEntry.key : K + get() = getKey().sure() /** Returns the value of the entry */ -// Temporary workaround: commenting out -//val JEntry.value : V -// get() = getValue().sure() +val JEntry.value : V + get() = getValue().sure() /** * Returns the value for the given key or returns the result of the defaultValue function if there was no entry for the given key @@ -64,3 +62,54 @@ public inline fun java.util.Map.getOrPut(key: K, defaultValue: ()-> V return answer } } + + +/** + * Returns an [[Iterator]] over the entries in the [[Map]] + * + * @includeFunctionBody ../../test/MapTest.kt iterateWithProperties + */ +public inline fun java.util.Map.iterator(): java.util.Iterator> { + val entrySet = this.entrySet()!! + return entrySet.iterator()!! +} + +/** + * Returns a new List containing the results of applying the given *transform* function to each [[Map.Entry]] in this [[Map]] + * + * @includeFunctionBody ../../test/CollectionTest.kt map + */ +public inline fun java.util.Map.map(transform: (java.util.Map.Entry) -> R) : java.util.List { + return mapTo(java.util.ArrayList(this.size), transform) +} + +/** + * Transforms each [[Map.Entry]] in this [[Map]] with the given *transform* function and + * adds each return value to the given *results* collection + */ +public inline fun > java.util.Map.mapTo(result: C, transform: (java.util.Map.Entry) -> R) : C { + for (item in this) + result.add(transform(item)) + return result +} + + +/** + * Returns a new Map containing the results of applying the given *transform* function to each [[Map.Entry]] in this [[Map]] + * + * @includeFunctionBody ../../test/MapTest.kt mapValues + */ +public inline fun java.util.Map.mapValues(transform : (java.util.Map.Entry) -> R): java.util.Map { + return mapValuesTo(java.util.HashMap(this.size), transform) +} + +/** + * Populates the given *result* [[Map]] with the value returned by applying the *transform* function on each [[Map.Entry]] in this [[Map]] + */ +public inline fun > java.util.Map.mapValuesTo(result: C, transform : (java.util.Map.Entry) -> R) : C { + for (e in this) { + val newValue = transform(e) + result.put(e.key, newValue) + } + return result +} diff --git a/libraries/stdlib/src/kotlin/ReadMe.md b/libraries/stdlib/src/kotlin/ReadMe.md new file mode 100644 index 00000000000..4d853bbae74 --- /dev/null +++ b/libraries/stdlib/src/kotlin/ReadMe.md @@ -0,0 +1,20 @@ +## Collections API + +There are a number of extension functions on [Collection](http://jetbrains.github.com/kotlin/versions/snapshot/apidocs/kotlin/java/util/Collection-extensions.html), [Iterator](http://jetbrains.github.com/kotlin/versions/snapshot/apidocs/kotlin/java/util/Iterator-extensions.html), [Map](http://jetbrains.github.com/kotlin/versions/snapshot/apidocs/kotlin/java/util/Map-extensions.html) and arrays to allow easy composition collections using familiar combinators like + +* filter() +* flatMap() +* map() +* fold() + +Functions on [Collection](http://jetbrains.github.com/kotlin/versions/snapshot/apidocs/kotlin/java/util/Collection-extensions.html), [Map](http://jetbrains.github.com/kotlin/versions/snapshot/apidocs/kotlin/java/util/Map-extensions.html) and arrays are all *eager*, in that methods like map() will create a complete result List when the method completes. + +Functions on [Iterator](http://jetbrains.github.com/kotlin/versions/snapshot/apidocs/kotlin/java/util/Iterator-extensions.html) are *lazy* so that they try to return new iterators that lazily evaluate things. For example map() returns a new Iterator that lazily maps the values in the original iterator. + +## Preconditions + +When writing code it is recommended you add checks early in a function to ensure parameters are valid. There are a number of helper methods for this: + +* assert(Boolean) and assert(Boolean) { lazyMessage } which use the JDK's assertion feature so they can be disabled using the -ea option +* check(Boolean) and check(Boolean) { lazyMessage } for checking something to be true and throwing [IllegalStateException](http://docs.oracle.com/javase/6/docs/api/java/lang/IllegalStateException.html) if not +* require(Boolean) and require(Boolean) { lazyMessage } for requiring something to be true and throwing [IllegalArgumentException](http://docs.oracle.com/javase/6/docs/api/java/lang/IllegalArgumentException.html) if not diff --git a/libraries/stdlib/test/CollectionTest.kt b/libraries/stdlib/test/CollectionTest.kt index 3d0f60b3567..069973acbee 100644 --- a/libraries/stdlib/test/CollectionTest.kt +++ b/libraries/stdlib/test/CollectionTest.kt @@ -120,9 +120,9 @@ class CollectionTest { } } + // TODO would be nice to avoid the test fun filterIntoSet() { val data = arrayList("foo", "bar") - // TODO would be nice to avoid the val foo = data.filterTo(hashSet()){it.startsWith("f")} assertTrue { @@ -136,9 +136,9 @@ class CollectionTest { } } + // TODO would be nice to avoid the test fun filterIntoSortedSet() { val data = arrayList("foo", "bar") - // TODO would be nice to avoid the val sorted = data.filterTo(sortedSet()){it.length == 3} assertEquals(2, sorted.size) assertEquals(sortedSet("bar", "foo"), sorted) @@ -176,59 +176,39 @@ class CollectionTest { assertEquals(6, count) } - - /* - // TODO would be nice to be able to write this as this - //numbers.fold(0){it + it2} - numbers.fold(0){(it, it2) -> it + it2} - - // TODO would be nice to be able to write this as this - // numbers.map{it.toString()}.fold(""){it + it2} - numbers.map{it.toString()}.fold(""){(it, it2) -> it + it2} - */ test fun fold() { // lets calculate the sum of some numbers expect(10) { val numbers = arrayList(1, 2, 3, 4) - numbers.fold(0){(it, it2) -> it + it2} + numbers.fold(0){ a, b -> a + b} } expect(0) { val numbers = arrayList() - numbers.fold(0){(it, it2) -> it + it2} + numbers.fold(0){ a, b -> a + b} } // lets concatenate some strings expect("1234") { val numbers = arrayList(1, 2, 3, 4) - numbers.map{it.toString()}.fold(""){(it, it2) -> it + it2} + numbers.map{it.toString()}.fold(""){ a, b -> a + b} } } - /* - // TODO would be nice to be able to write this as this - // numbers.map{it.toString()}.foldRight(""){it + it2} - numbers.map{it.toString()}.foldRight(""){(it, it2) -> it + it2} - */ test fun foldRight() { expect("4321") { val numbers = arrayList(1, 2, 3, 4) - numbers.map{it.toString()}.foldRight(""){(it, it2) -> it + it2} + numbers.map{it.toString()}.foldRight(""){ a, b -> a + b} } } - /* - TODO inference engine should not need this type info? - val byLength = words.groupBy{it.length} - */ test fun groupBy() { val words = arrayList("a", "ab", "abc", "def", "abcd") - val byLength = words.groupBy{it.length} + val byLength = words.groupBy{ it.length } assertEquals(4, byLength.size()) val l3 = byLength.getOrElse(3, {ArrayList()}) assertEquals(2, l3.size) - } test fun makeString() { diff --git a/libraries/stdlib/test/MapTest.kt b/libraries/stdlib/test/MapTest.kt index 6df00479012..3588c138479 100644 --- a/libraries/stdlib/test/MapTest.kt +++ b/libraries/stdlib/test/MapTest.kt @@ -3,12 +3,11 @@ package test.collections import kotlin.test.* import java.util.* -import junit.framework.TestCase -import org.junit.Test +import org.junit.Test as test class MapTest { - Test fun getOrElse() { + test fun getOrElse() { val data = HashMap() val a = data.getOrElse("foo"){2} assertEquals(2, a) @@ -18,7 +17,7 @@ class MapTest { assertEquals(0, data.size()) } - Test fun getOrPut() { + test fun getOrPut() { val data = HashMap() val a = data.getOrPut("foo"){2} assertEquals(2, a) @@ -29,13 +28,13 @@ class MapTest { assertEquals(1, data.size()) } - Test fun sizeAndEmpty() { + test fun sizeAndEmpty() { val data = HashMap() assertTrue{ data.empty } assertEquals(data.size, 0) } - Test fun setViaIndexOperators() { + test fun setViaIndexOperators() { val map = HashMap() assertTrue{ map.empty } assertEquals(map.size, 0) @@ -46,4 +45,95 @@ class MapTest { assertEquals(map.size(), 1) assertEquals("James", map["name"]) } + + test fun iterate() { + val map = TreeMap() + map["beverage"] = "beer" + map["location"] = "Mells" + map["name"] = "James" + + val list = arrayList() + for (e in map) { + println("key = ${e.getKey()}, value = ${e.getValue()}") + list.add(e.getKey()) + list.add(e.getValue()) + } + + assertEquals(6, list.size()) + assertEquals("beverage,beer,location,Mells,name,James", list.makeString(",")) + } + + test fun iterateWithProperties() { + val map = TreeMap() + map["beverage"] = "beer" + map["location"] = "Mells" + map["name"] = "James" + + val list = arrayList() + for (e in map) { + println("key = ${e.key}, value = ${e.value}") + list.add(e.key) + list.add(e.value) + } + + assertEquals(6, list.size()) + assertEquals("beverage,beer,location,Mells,name,James", list.makeString(",")) + } + + /* + TODO compiler bug + we should be able to remove the explicit type on the map function + http://youtrack.jetbrains.net/issue/KT-1145 + */ + test fun map() { + val m1 = TreeMap() + m1["beverage"] = "beer" + m1["location"] = "Mells" + + val list = m1.map{ it.value + " rocks" } + + println("Got new list $list") + assertEquals(arrayList("beer rocks", "Mells rocks"), list) + } + + /* + TODO compiler bug + we should be able to remove the explicit type on the mapValues function + http://youtrack.jetbrains.net/issue/KT-1145 + */ + test fun mapValues() { + val m1 = TreeMap() + m1["beverage"] = "beer" + m1["location"] = "Mells" + + val m2 = m1.mapValues{ it.value + "2" } + + println("Got new map $m2") + assertEquals(arrayList("beer2", "Mells2"), m2.values().toList()) + } + + + /** + TODO + test case for http://youtrack.jetbrains.com/issue/KT-1773 + + test fun compilerBug() { + val map = TreeMap() + map["beverage"] = "beer" + map["location"] = "Mells" + map["name"] = "James" + + var list = arrayList() + for (e in map) { + println("key = ${e.getKey()}, value = ${e.getValue()}") + list += e.getKey() + list += e.getValue() + } + + assertEquals(6, list.size()) + assertEquals("beverage,beer,location,Mells,name,James", list.makeString(",")) + println("==== worked! $list") + } + */ + } diff --git a/libraries/stdlib/test/dom/DomTest.kt b/libraries/stdlib/test/dom/DomTest.kt index 9a6122ad193..5a0ae364c23 100644 --- a/libraries/stdlib/test/dom/DomTest.kt +++ b/libraries/stdlib/test/dom/DomTest.kt @@ -4,15 +4,15 @@ import kotlin.* import kotlin.dom.* import kotlin.test.* import org.w3c.dom.* -import junit.framework.TestCase +import org.junit.Test as test -class DomTest() : TestCase() { +class DomTest { - fun testCreateDocument() { + test fun testCreateDocument() { var doc = createDocument() assertNotNull(doc, "Should have created a document") - val e = doc.createElement("foo").sure() + val e = doc.createElement("foo")!! assertCssClass(e, "") // now lets update the cssClass property @@ -27,6 +27,19 @@ class DomTest() : TestCase() { println("document ${doc.toXmlString()}") } + test fun addText() { + var doc = createDocument() + assertNotNull(doc, "Should have created a document") + + val e = doc.createElement("foo")!! + e + "hello" + + println("element after text ${e.toXmlString()}") + + assertEquals("hello", e.text) + + } + fun assertCssClass(e: Element, value: String?): Unit { val cl = e.classes diff --git a/libraries/tools/kdoc-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/doc/KDocMojo.java b/libraries/tools/kdoc-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/doc/KDocMojo.java index 16b7bc6c3be..83c99535bef 100644 --- a/libraries/tools/kdoc-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/doc/KDocMojo.java +++ b/libraries/tools/kdoc-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/doc/KDocMojo.java @@ -25,6 +25,7 @@ import org.jetbrains.kotlin.doc.KDocConfig; import org.jetbrains.kotlin.maven.KotlinCompileMojoBase; import java.util.List; +import java.util.Map; /** * Generates API docs documentation for kotlin sources @@ -118,6 +119,20 @@ public class KDocMojo extends KotlinCompileMojoBase { */ private String version; + /** + * The HTTP link to source code + * + * @parameter expression="${sourceRootHref}" + */ + private String sourceRootHref; + + /** + * The root project directory used to deduce relative file names when linking to source code + * + * @parameter expression="${projectRootDir}" default-value="${project.basedir}" + */ + private String projectRootDir; + /** * Whether warnings should be generated if no comments could be found for classes, functions and properties being documented * @@ -125,6 +140,29 @@ public class KDocMojo extends KotlinCompileMojoBase { */ private boolean warnNoComments; + /** + * A Map of package name to file names for the description of packages. + * This allows you to refer to ReadMe.md files in your project root directory which will then be included in the API Doc. + * For packages which are not configured, KDoc will look for ReadMe.html or ReadMe.md files in the package source directory + * + * @parameter expression="${packageDescriptionFiles}" + */ + private Map packageDescriptionFiles; + + /** + * A Map of package name prefixes to HTTP URLs so we can link the API docs to external packages + * + * @parameter expression="${packagePrefixToUrls}" + */ + private Map packagePrefixToUrls; + + /** + * A Map of package name to summary text used in the package overview tables to give a brief summary for each package + * + * @parameter expression="${packagePrefixToUrls}" + */ + private Map packageSummaryText; + @Override protected KotlinCompiler createCompiler() { return new KDocCompiler(); @@ -146,14 +184,29 @@ public class KDocMojo extends KotlinCompileMojoBase { if (ignorePackages != null) { docConfig.getIgnorePackages().addAll(ignorePackages); } + if (packageDescriptionFiles != null) { + docConfig.getPackageDescriptionFiles().putAll(packageDescriptionFiles); + } + if (packagePrefixToUrls != null) { + docConfig.getPackagePrefixToUrls().putAll(packagePrefixToUrls); + } + if (packageSummaryText != null) { + docConfig.getPackageSummaryText().putAll(packageSummaryText); + } docConfig.setIncludeProtected(includeProtected); docConfig.setTitle(title); docConfig.setVersion(version); docConfig.setWarnNoComments(warnNoComments); + docConfig.setSourceRootHref(sourceRootHref); + docConfig.setProjectRootDir(projectRootDir); getLog().info("API docs output to: " + docConfig.getDocOutputDir()); getLog().info("classpath: " + classpath); getLog().info("title: " + title); getLog().info("sources: " + sources); + getLog().info("sourceRootHref: " + sourceRootHref); + getLog().info("projectRootDir: " + projectRootDir); + getLog().info("packageDescriptionFiles: " + packageDescriptionFiles); + getLog().info("packagePrefixToUrls: " + packagePrefixToUrls); getLog().info("API docs ignore packages: " + ignorePackages); } else { diff --git a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/KDocCompiler.kt b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/KDocCompiler.kt index 3296f42d71b..565a7a25a62 100644 --- a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/KDocCompiler.kt +++ b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/KDocCompiler.kt @@ -20,8 +20,8 @@ fun main(args: Array): Unit { */ class KDocCompiler() : KotlinCompiler() { - protected override fun configureEnvironment(environment : CompileEnvironment?, arguments : CompilerArguments?, errStream : PrintStream?) { - super.configureEnvironment(environment, arguments, errStream) + protected override fun configureEnvironment(environment : CompileEnvironment?, arguments : CompilerArguments?) { + super.configureEnvironment(environment, arguments) val coreEnvironment = environment?.getEnvironment() if (coreEnvironment != null) { val kdoc = KDoc() diff --git a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/KDocConfig.kt b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/KDocConfig.kt index 098b0686795..8c0501e69c2 100644 --- a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/KDocConfig.kt +++ b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/KDocConfig.kt @@ -26,7 +26,8 @@ class KDocConfig() { public var version: String = "SNAPSHOT" /** - * Returns a map of the package prefix to the URLs to use to link to it in the documentation + * Returns a map of the package prefix to the HTML URL for the root of the apidoc using javadoc/kdoc style + * directory layouts so that this API doc report can link to external packages */ public val packagePrefixToUrls: Map = TreeMap(LongestFirstStringComparator()) @@ -41,6 +42,27 @@ class KDocConfig() { */ public var warnNoComments: Boolean = true + /** + * Returns the HTTP URL of the root directory of source code that we should link to + */ + public var sourceRootHref: String? = null + + /** + * The root project directory used to deduce relative file names when linking to source code + */ + public var projectRootDir: String? = null + + /** + * A map of package name to html or markdown files used to describe the package. If none is + * speciied we will look for a package.html or package.md file in the source tree + */ + public var packageDescriptionFiles: Map = HashMap() + + /** + * A map of package name to summary text used in the package overviews + */ + public var packageSummaryText: Map = HashMap() + /** * Returns true if protected functions and properties should be documented */ @@ -69,21 +91,16 @@ class KDocConfig() { /** * Resolves a link to the given class name */ - fun resolveLink(packageName: String): String { - // TODO should be able to do something like - // for (e in packageUrls.filterNotNull()) { - val entrySet = packagePrefixToUrls.entrySet() - if (entrySet != null) { - for (e in entrySet) { - val p = e?.getKey() - val url = e?.getValue() - if (p != null && url != null) { - if (packageName.startsWith(p)) { - return url - } + fun resolveLink(packageName: String, warn: Boolean = true): String { + for (e in packagePrefixToUrls) { + val p = e.key + val url = e.value + if (p != null && url != null) { + if (packageName.startsWith(p)) { + return url } } - } + } if (missingPackageUrls.add(packageName)) { println("Warning: could not find external link to package: $packageName") } diff --git a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/model/KotlinModel.kt b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/model/KotlinModel.kt index 82a4981e10f..80780cc4051 100644 --- a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/model/KotlinModel.kt +++ b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/model/KotlinModel.kt @@ -39,6 +39,10 @@ import com.intellij.psi.PsiElement import com.intellij.psi.PsiFile import com.intellij.psi.PsiDirectory import org.jetbrains.jet.lang.descriptors.Visibilities +import org.jetbrains.jet.lang.diagnostics.DiagnosticUtils +import org.jetbrains.jet.lang.diagnostics.DiagnosticUtils.LineAndColumn +import com.intellij.psi.PsiFileSystemItem +import java.io.File /** @@ -75,6 +79,10 @@ fun warning(message: String) { println("Warning: $message") } +fun info(message: String) { + // println("info: $message") +} + // TODO for some reason the SortedMap causes kotlin to freak out a little :) fun inheritedExtensionFunctions(functions: Collection): Map> { //fun inheritedExtensionFunctions(functions: Collection): SortedMap> { @@ -136,14 +144,14 @@ fun inheritedExtensionProperties(properties: Collection): Map): Map> { val map = TreeMap>() - functions.filter{ it.extensionClass != null }.groupBy(map){ it.extensionClass.sure() } + functions.filter{ it.extensionClass != null }.groupByTo(map){ it.extensionClass.sure() } return map } // TODO for some reason the SortedMap causes kotlin to freak out a little :) fun extensionProperties(properties: Collection): Map> { val map = TreeMap>() - properties.filter{ it.extensionClass != null }.groupBy(map){ it.extensionClass.sure() } + properties.filter{ it.extensionClass != null }.groupByTo(map){ it.extensionClass.sure() } return map } @@ -190,6 +198,32 @@ class KModel(var context: BindingContext, val config: KDocConfig) { public val version: String get() = config.version + private var _projectRootDir: String? = null + + /** + * File names we look for in a package directory for the overall description of a package for KDoc + */ + val packageDescriptionFiles = arrayList("readme.md", "ReadMe.md, readme.html, ReadMe.html") + + private val readMeDirsScanned = HashSet() + + /** + * Returns the root project directory for calculating relative source links + */ + fun projectRootDir(): String { + if (_projectRootDir == null) { + val rootDir = config.projectRootDir + _projectRootDir = if (rootDir == null) { + warning("KDocConfig does not have a projectRootDir defined so we cannot generate relative source Hrefs") + "" + } else { + File(rootDir).getCanonicalPath() ?: "" + } + } + return _projectRootDir ?: "" + } + + /** Loads the model from the given set of source files */ fun load(sources: List): Unit { val allNamespaces = HashSet() @@ -236,10 +270,52 @@ class KModel(var context: BindingContext, val config: KDocConfig) { val scope = descriptor.getMemberScope() addFunctions(pkg, scope) pkg.local = isLocal(descriptor) + pkg.useExternalLink = pkg.model.config.resolveLink(pkg.name, false).notEmpty() + + if (pkg.wikiDescription.isEmpty()) { + // lets try find a custom doc + var file = config.packageDescriptionFiles[name] + loadWikiDescription(pkg, file) + } } return pkg; } + protected fun loadWikiDescription(pkg: KPackage, file: String?): Unit { + if (file != null) { + try { + pkg.wikiDescription = File(file).readText() + } catch (e: Throwable) { + warning("Failed to load package ${pkg.name} documentation file $file. Reason $e") + } + } + } + + /** + * If a package has no detailed description lets try load it from the descriptors + * source directory if we've not checked that directory before + */ + fun tryLoadReadMe(pkg: KPackage, descriptor: DeclarationDescriptor): Unit { + if (pkg.wikiDescription.isEmpty()) { + // lets try find the package.html or package.md file + val srcPath = pkg.model.filePath(descriptor) + if (srcPath != null) { + val srcFile = File(srcPath) + val dir = if (srcFile.isDirectory()) srcFile else srcFile.getParentFile() + if (dir != null && readMeDirsScanned.add(dir.getPath()!!)) { + val f = packageDescriptionFiles.map{ File(dir, it) }.find{ it.exists() } + if (f != null) { + val file = f.getCanonicalPath() + loadWikiDescription(pkg, file) + } + else { + info("package ${pkg.name} has no ReadMe.(html|md) in $dir") + } + } + } + } + } + fun wikiConvert(text: String, linkRenderer: LinkRenderer, fileName: String?): String { return markdownProcessor.markdownToHtml(text, linkRenderer).sure() } @@ -344,12 +420,30 @@ class KModel(var context: BindingContext, val config: KDocConfig) { return null } + fun locationFor(descriptor: DeclarationDescriptor): LineAndColumn? { + val psiElement = getPsiElement(descriptor) + if (psiElement != null) { + val document = psiElement.getContainingFile()?.getViewProvider()?.getDocument() + if (document != null) { + val offset = psiElement.getTextOffset() + return DiagnosticUtils.offsetToLineAndColumn(document, offset) + } + } + return null + } fun fileFor(descriptor: DeclarationDescriptor): String? { val psiElement = getPsiElement(descriptor) return psiElement?.getContainingFile()?.getName() } + fun filePath(descriptor: DeclarationDescriptor): String? { + val psiElement = getPsiElement(descriptor) + val file = psiElement?.getContainingFile() + return filePath(file) + } + + protected fun getPsiElement(descriptor: DeclarationDescriptor): PsiElement? { return try { BindingContextUtils.descriptorToDeclaration(context, descriptor) @@ -412,7 +506,7 @@ class KModel(var context: BindingContext, val config: KDocConfig) { } } } else { - warning("Uknown kdoc macro @$remaining") + warning("Unknown kdoc macro @$remaining") } } buffer.append(text) @@ -446,6 +540,17 @@ class KModel(var context: BindingContext, val config: KDocConfig) { return null } + protected fun filePath(file: PsiFileSystemItem?): String? { + if (file != null) { + var dir = file.getParent() + if (dir != null) { + val parentName = filePath(dir) ?: "" + return parentName + "/" + file.getName() + } + } + return null + } + /** * Extracts the block of code within { .. } tokens or returning null if it can't be found */ @@ -543,14 +648,20 @@ class KModel(var context: BindingContext, val config: KDocConfig) { fun getClass(classElement: ClassDescriptor): KClass? { val name = classElement.getName() - val container = classElement.getContainingDeclaration() - if (name != null && container is NamespaceDescriptor) { - val pkg = getPackage(container) - return pkg.getClass(name, classElement) - } else { - warning("no package found for $container and class $name") - return null + if (name != null) { + var dec: DeclarationDescriptor? = classElement.getContainingDeclaration() + while (dec != null) { + val container = dec + if (container is NamespaceDescriptor) { + val pkg = getPackage(container) + return pkg.getClass(name, classElement) + } else { + dec = dec?.getContainingDeclaration() + } + } + warning("no package found for class $name") } + return null } fun previous(pkg: KPackage): KPackage? { @@ -690,7 +801,7 @@ abstract class KAnnotated(val model: KModel, val declarationDescriptor: Declarat public open var deprecated: Boolean = false - fun description(template: KDocTemplate): String { + open fun description(template: KDocTemplate): String { val detailedText = detailedDescription(template) val idx = detailedText.indexOf("

") return if (idx > 0) { @@ -701,8 +812,52 @@ abstract class KAnnotated(val model: KModel, val declarationDescriptor: Declarat } fun detailedDescription(template: KDocTemplate): String { + val wiki = wikiDescription + return wikiConvert(wiki, template) + } + + protected fun wikiConvert(wiki: String, template: KDocTemplate): String { val file = model.fileFor(declarationDescriptor) - return model.wikiConvert(wikiDescription, TemplateLinkRenderer(this, template), file) + return model.wikiConvert(wiki, TemplateLinkRenderer(this, template), file) + } + + fun isLinkToSourceRepo(): Boolean { + return model.config.sourceRootHref != null + } + + fun sourceTargetAttribute(): String { + return if (isLinkToSourceRepo()) " target=\"_top\" class=\"repoSourceCode\"" else "" + } + + fun sourceLink(): String { + val file = filePath() + if (file != null) { + // lets remove the root project directory + val rootDir = model.projectRootDir() + val canonicalFile = File(file).getCanonicalPath() ?: "" + val relativeFile = if (rootDir != null && canonicalFile.startsWith(rootDir)) + canonicalFile.substring(rootDir.length()) else canonicalFile + return sourceLinkFor(relativeFile!!) + } + return "" + } + + fun filePath(): String? = model.filePath(declarationDescriptor) + + protected fun sourceLinkFor(filePath: String, lineLinkText: String = "#L"): String { + val root = model.config.sourceRootHref!! + val cleanRoot = root.trimTrailing("/") + val cleanPath = filePath.trimLeading("/") + return "$cleanRoot/$cleanPath$lineLinkText$sourceLine" + + } + + fun location(): LineAndColumn? = model.locationFor(declarationDescriptor) + + val sourceLine: Int + get() { + val loc = location() + return if (loc != null) loc.getLine() else 1 } } @@ -718,7 +873,18 @@ abstract class KNamed(val name: String, model: KModel, declarationDescriptor: De class KPackage(model: KModel, val descriptor: NamespaceDescriptor, val name: String, - var local: Boolean = false): KClassOrPackage(model, descriptor), Comparable { + var local: Boolean = false, + var useExternalLink: Boolean = false): KClassOrPackage(model, descriptor), Comparable { + + + // TODO generates java.lang.NoSuchMethodError: kotlin.util.namespace.hashMap(Ljet/TypeInfo;Ljet/TypeInfo;)Ljava/util/HashMap; + //val classes = sortedMap() + public val classMap: SortedMap = TreeMap() + + public val classes: Collection + get() = classMap.values().sure().filter{ it.isApi() } + + public val annotations: Collection = ArrayList() public override fun compareTo(other: KPackage): Int = name.compareTo(other.name) @@ -733,6 +899,10 @@ class KPackage(model: KModel, val descriptor: NamespaceDescriptor, KClass(this, descriptor, name) } if (created) { + // sometimes we may have source files for a package in different source directories + // such as the kotlin package in generated directory; so lets always check if we can find + // the readme + model.tryLoadReadMe(this, descriptor) model.configureComments(klass, descriptor) val typeConstructor = descriptor.getTypeConstructor() val superTypes = typeConstructor.getSupertypes() @@ -772,14 +942,14 @@ class KPackage(model: KModel, val descriptor: NamespaceDescriptor, return if (answer.length == 0) "" else answer + "/" } - // TODO generates java.lang.NoSuchMethodError: kotlin.util.namespace.hashMap(Ljet/TypeInfo;Ljet/TypeInfo;)Ljava/util/HashMap; - //val classes = sortedMap() - public val classMap: SortedMap = TreeMap() - - public val classes: Collection - get() = classMap.values().sure().filter{ it.isApi() } - - public val annotations: Collection = ArrayList() + override fun description(template: KDocTemplate): String { + // lets see if we can find a custom summary + val text = model.config.packageSummaryText[name] + return if (text != null) + wikiConvert(text, template).trimLeading("

").trimTrailing("

") + else + super.description(template) + } fun qualifiedName(simpleName: String): String { return if (name.length() > 0) { @@ -789,7 +959,6 @@ class KPackage(model: KModel, val descriptor: NamespaceDescriptor, } } - fun previous(pkg: KClass): KClass? { // TODO return null @@ -801,7 +970,7 @@ class KPackage(model: KModel, val descriptor: NamespaceDescriptor, } fun groupClassMap(): Map> { - return classes.groupBy(TreeMap>()){it.group} + return classes.groupByTo(TreeMap>()){it.group} } fun packageFunctions() = functions.filter{ it.extensionClass == null } @@ -838,8 +1007,7 @@ class KClass(val pkg: KPackage, val descriptor: ClassDescriptor, var since: String = "", var authors: List = arrayList(), var baseClasses: List = arrayList(), - var nestedClasses: List = arrayList(), - var sourceLine: Int = 2): KClassOrPackage(pkg.model, descriptor), Comparable { + var nestedClasses: List = arrayList()): KClassOrPackage(pkg.model, descriptor), Comparable { public override fun compareTo(other: KClass): Int = name.compareTo(other.name) @@ -921,8 +1089,7 @@ class KFunction(val descriptor: CallableDescriptor, val owner: KClassOrPackage, var modifiers: List = arrayList(), var typeParameters: List = arrayList(), var exceptions: List = arrayList(), - var annotations: List = arrayList(), - var sourceLine: Int = 2): KAnnotated(owner.model, descriptor), Comparable { + var annotations: List = arrayList()): KAnnotated(owner.model, descriptor), Comparable { public val parameterTypeText: String = parameters.map{ it.aType.name }.makeString(", ") diff --git a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/ClassExtensionsTemplate.kt b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/ClassExtensionsTemplate.kt index 507985d9d6f..f43aabefdab 100644 --- a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/ClassExtensionsTemplate.kt +++ b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/ClassExtensionsTemplate.kt @@ -29,7 +29,7 @@ ${pkg.name} Extensions on ${klass.name}
-extension functions on class ${klass.name}
+extension functions on class ${klass.name}
from package ${link(pkg)}
diff --git a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/ClassTemplate.kt b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/ClassTemplate.kt index fa990cc07b0..7692df5c02d 100644 --- a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/ClassTemplate.kt +++ b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/ClassTemplate.kt @@ -77,17 +77,17 @@ function windowTitle() printPrevNextClass() println("""
""") printPrevNextClass() println("""
- FRAMES   + FRAMES    NO FRAMES     @@ -134,7 +134,7 @@ DETAIL: PROPERTY | CONSTR | FU
- FRAMES   + FRAMES    NO FRAMES     @@ -136,9 +136,9 @@ ${pkg.detailedDescription(this)} """) val groupMap = pkg.groupClassMap() - for (e in groupMap.entrySet()) { - val group = e?.getKey() ?: "Other" - val list = e?.getValue() + for (e in groupMap) { + val group = e.key ?: "Other" + val list = e.value if (list != null) { println("""

$group

@@ -192,7 +192,7 @@ ${pkg.detailedDescription(this)} printNextPrevPackages() println("""		 -) FRAMES   + FRAMES    NO FRAMES     + +""" } } \ No newline at end of file